围栏修改

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

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
+import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
 import com.zhgd.xmgl.modules.safetyhat.entity.vo.QueryEnterpriseTreeVo;
+import com.zhgd.xmgl.modules.safetyhat.entity.vo.QueryFenceTreeVo;
 import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDevService;
+import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
 import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
@@ -61,6 +64,9 @@ public class SafetyHatDevController {
     @Autowired
     private ISafetyHatDevService safetyHatDevService;
 
+    @Autowired
+    private ISafetyHatFenceService safetyHatFenceService;
+
     /**
      * 分页列表查询
      *
@@ -228,4 +234,22 @@ public class SafetyHatDevController {
         }
         return Result.success(rt);
     }
+
+    @OperLog(operModul = "智能安全帽设备管理", operType = "查询", operDesc = "树形列表查询围栏-智能安全帽-设备信息")
+    @ApiOperation(value = "树形列表查询围栏-智能安全帽-设备信息", notes = "树形列表查询围栏-智能安全帽-设备信息", httpMethod = "GET")
+    @GetMapping(value = "/fence/tree/list")
+    public Result<List<QueryFenceTreeVo>> queryFenceTreeList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        List<SafetyHatDev> safetyHatDevs = safetyHatDevService.queryList(paramMap);
+        List<SafetyHatFence> safetyHatFences = safetyHatFenceService.queryList(paramMap);
+        List<QueryFenceTreeVo> rt = new ArrayList<>();
+        for (SafetyHatFence safetyHatFence : safetyHatFences) {
+            QueryFenceTreeVo vo = new QueryFenceTreeVo();
+            vo.setName(safetyHatFence.getFenceName());
+            vo.setFenceId(safetyHatFence.getId());
+            vo.setSafetyHatDevs(safetyHatDevs.stream().filter(s -> s.getFenceId().toString().equals(safetyHatFence.getId().toString()))
+                    .collect(Collectors.toList()));
+            rt.add(vo);
+        }
+        return Result.success(rt);
+    }
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java

@@ -93,7 +93,12 @@ public class SafetyHatAlarm implements Serializable {
     @Excel(name = "当前位置经度y", width = 15)
     @ApiModelProperty(value = "当前位置经度y")
     private java.lang.Double longitude;
-
+    /**
+     * 围栏ID
+     */
+    @Excel(name = "围栏ID", width = 15)
+    @ApiModelProperty(value = "围栏ID")
+    private java.lang.String fenceId;
     /**
      * 人员名称
      */
@@ -101,4 +106,11 @@ public class SafetyHatAlarm implements Serializable {
     @ApiModelProperty(value = "人员名称")
     @TableField(exist = false)
     private java.lang.String workerName;
+    /**
+     * 围栏名称
+     */
+    @Excel(name = "围栏名称", width = 15)
+    @ApiModelProperty(value = "围栏名称")
+    @TableField(exist = false)
+    private java.lang.String fenceName;
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java

@@ -97,6 +97,21 @@ public class SafetyHatDev implements Serializable {
     @ApiModelProperty(value = "人员名称")
     @TableField(exist = false)
     private java.lang.String workerName;
+    /**
+     * 围栏名称
+     */
+    @Excel(name = "围栏名称", width = 15)
+    @ApiModelProperty(value = "围栏名称")
+    @TableField(exist = false)
+    private java.lang.String fenceName;
+
+    /**
+     * 围栏ID
+     */
+    @Excel(name = "围栏ID", width = 15)
+    @ApiModelProperty(value = "围栏ID")
+    private java.lang.String fenceId;
+
     @TableField(exist = false)
     private java.lang.String name;
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/vo/QueryFenceTreeVo.java

@@ -0,0 +1,17 @@
+package com.zhgd.xmgl.modules.safetyhat.entity.vo;
+
+import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public
+class QueryFenceTreeVo {
+    @ApiModelProperty(value = "围栏名称")
+    private String name;
+    @ApiModelProperty(value = "围栏id")
+    private Long fenceId;
+    private List<SafetyHatDev> safetyHatDevs;
+}

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

@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatAlarmMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm">
-        select sha.*, wi.worker_name
+        select sha.*, wi.worker_name, hf.fence_name
         from safety_hat_alarm sha
         left join worker_info wi on wi.id = sha.worker_info_id
+        left join safety_hat_fence hf on hf.id = sha.fence_id
         ${ew.customSqlSegment}
     </select>
 

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

@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev">
-        select shd.*,wi.worker_name
+        select shd.*,wi.worker_name, hf.fence_name
         from safety_hat_dev shd
         left join worker_info wi on wi.id = shd.worker_info_id
+        left join safety_hat_fence hf on hf.id = shd.fence_id
         ${ew.customSqlSegment}
     </select>
 

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

@@ -158,6 +158,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
                 alarm.setAlarmType(2);
                 alarm.setLatitude(safetyHatData.getLatitude());
                 alarm.setLongitude(safetyHatData.getLongitude());
+                alarm.setFenceId(dev.getFenceId());
                 safetyHatAlarmService.add(alarm);
             }
         }

src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java

@@ -18,6 +18,7 @@ import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataMapper;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper;
+import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataService;
 import com.zhgd.xmgl.util.RundeSafeyHatUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.core.SchedulerLock;
@@ -52,6 +53,8 @@ public class SafetyHatTask {
     @Autowired
     SafetyHatDataMapper safetyHatDataMapper;
     @Autowired
+    ISafetyHatDataService safetyHatDataService;
+    @Autowired
     WebSocketContainer webSocketContainer;
 
     /**
@@ -153,7 +156,7 @@ public class SafetyHatTask {
                             data.setUploadTime(new Date(time * 1000L));
                             data.setProjectSn(dev.getProjectSn());
                             data.setIsPlatformData(1);
-                            safetyHatDataMapper.insert(data);
+                            safetyHatDataService.add(data);
                         }
                     } else {
                         log.error("定时2分钟获取安全帽数据任务失败：devSn：{}", dev.getDevSn());