调整

src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java

@@ -163,6 +163,23 @@ public class SafetyHatDataController {
         return Result.success(safetyHatDataService.getNewestList(paramMap));
     }
 
+    /**
+     * 暂时没有使用
+     *
+     * @param paramMap
+     * @return
+     */
+    @OperLog(operModul = "智能安全帽实时数据管理", operType = "查询", operDesc = "获取每个设备最新一条实时数据信息")
+    @ApiOperation(value = "获取每个设备最新一条实时数据信息", notes = "获取每个设备最新一条实时数据信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "devSns", value = "设备sns（不传查全部）", paramType = "query", required = false, dataType = "String"),
+    })
+    @PostMapping(value = "/getNewestList1")
+    public Result<List<SafetyHatData>> getNewestList1(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(safetyHatDataService.getNewestList1(paramMap));
+    }
+
 
     @OperLog(operModul = "智能安全帽实时数据管理", operType = "查询", operDesc = "列表查询智能安全帽-实时数据信息")
     @ApiOperation(value = "列表查询智能安全帽-实时数据信息（查询今日会调接口查询）", notes = "列表查询智能安全帽-实时数据信息（查询今日会调接口查询）", httpMethod = "GET")

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java

@@ -53,6 +53,8 @@ public interface SafetyHatDataMapper extends BaseMapper<SafetyHatData> {
      */
     List<SafetyHatData> getNewestList(HashMap<String, Object> paramMap);
 
+    List<SafetyHatData> getNewestList1(HashMap<String, Object> paramMap);
+
     /**
      * 批量插入
      *

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml

@@ -38,6 +38,26 @@
         group by t.dev_sn
     </select>
 
+    <select id="getNewestList1" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
+        select shd.*, wi.worker_name from safety_hat_data shd join (
+        select max(upload_time) as upload_time, dev_sn
+        from safety_hat_data
+        where 1 = 1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSns != null and devSns != ''">
+            and dev_sn in
+            <foreach collection="devSns" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by dev_sn
+        )t on t.upload_time=shd.upload_time and t.dev_sn=shd.dev_sn
+        left join worker_info wi on wi.id = shd.worker_info_id
+        group by t.dev_sn
+    </select>
+
     <insert id="batchInsert" parameterType="map">
         <!--@mbg.generated-->
         insert into safety_hat_data

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java

@@ -62,6 +62,8 @@ public interface ISafetyHatDataService extends IService<SafetyHatData> {
      */
     List<SafetyHatData> getNewestList(HashMap<String, Object> paramMap);
 
+    List<SafetyHatData> getNewestList1(HashMap<String, Object> paramMap);
+
     /**
      * 更新状态
      *

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java

@@ -175,6 +175,12 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
         return baseMapper.getNewestList(paramMap);
     }
 
+    @Override
+    public List<SafetyHatData> getNewestList1(HashMap<String, Object> paramMap) {
+        return baseMapper.getNewestList1(paramMap);
+    }
+
+
     @Override
     public void updateStatus(SafetyHatDev safetyHatDev) {
         SafetyHatDev dev = safetyHatDevMapper.selectOne(new LambdaQueryWrapper<SafetyHatDev>()