安全带接入

src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java

@@ -172,6 +172,10 @@ public class SafetyHatWSClient {
                         alarm.setLatitude(yPoint);
                         alarm.setLongitude(xPoint);
                         alarm.setFenceId(dev.getFenceId());
+                        alarm.setType(dev.getType());
+                        if (dev.getType() == 2) {
+                            alarm.setAlarmInfo(jo.getString("msg"));
+                        }
                         try {
                             SpringContextUtils.getBean(ISafetyHatAlarmService.class).add(alarm);
                         } catch (Exception e) {

src/main/java/com/zhgd/xmgl/enums/ParamEnum.java

@@ -1315,6 +1315,10 @@ public class ParamEnum {
          * 血压报警
          */
         XYBJ(22, "血压报警"),
+        /**
+         * 双钩均未挂接
+         */
+        AQDBJ(27, "双钩均未挂接"),
         ;
 
         private Integer value;

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

@@ -195,8 +195,8 @@ public class SafetyHatDevController {
             @ApiImplicitParam(name = "file", value = "导入文件", paramType = "query", required = true, dataType = "String"),
     })
     @PostMapping(value = "/importExcelTemplate")
-    public Result importExcelTemplate(MultipartFile file, String projectSn) throws Exception {
+    public Result importExcelTemplate(MultipartFile file, String projectSn, Integer type) throws Exception {
-        safetyHatDevService.importExcelTemplate(file, projectSn);
+        safetyHatDevService.importExcelTemplate(file, projectSn, type);
         return Result.ok();
     }
 

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

@@ -99,6 +99,12 @@ public class SafetyHatAlarm implements Serializable {
     @Excel(name = "围栏ID", width = 15)
     @ApiModelProperty(value = "围栏ID")
     private java.lang.String fenceId;
+    /**
+     * 设备类型(1：安全帽;2:安全带)
+     */
+    @Excel(name = "设备类型(1：安全帽;2:安全带)", width = 15)
+    @ApiModelProperty(value = "设备类型(1：安全帽;2:安全带)")
+    private java.lang.Integer type;
     /**
      * 人员名称
      */

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

@@ -89,6 +89,13 @@ public class SafetyHatData implements Serializable {
     @ApiModelProperty(value = "是否安全帽平台的数据")
     private java.lang.Integer isPlatformData;
 
+    /**
+     * 设备类型(1：安全帽;2:安全带)
+     */
+    @Excel(name = "设备类型(1：安全帽;2:安全带)", width = 15)
+    @ApiModelProperty(value = "设备类型(1：安全帽;2:安全带)")
+    private java.lang.Integer type;
+
     /**
      * 人员名称
      */

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

@@ -112,6 +112,13 @@ public class SafetyHatDev implements Serializable {
     @ApiModelProperty(value = "围栏ID")
     private java.lang.String fenceId;
 
+    /**
+     * 设备类型(1：安全帽;2:安全带)
+     */
+    @Excel(name = "设备类型(1：安全帽;2:安全带)", width = 15)
+    @ApiModelProperty(value = "设备类型(1：安全帽;2:安全带)")
+    private java.lang.Integer type;
+
     @TableField(exist = false)
     private java.lang.String name;
 }

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

@@ -73,5 +73,5 @@ public interface ISafetyHatDevService extends IService<SafetyHatDev> {
      * @param projectSn
      * @throws Exception
      */
-    void importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception;
+    void importExcelTemplate(MultipartFile excelFile, String projectSn, Integer type) throws Exception;
 }

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

@@ -82,8 +82,10 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
         if (dev == null) {
             throw new OpenAlertException("设备编号不正确");
         }
-        String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
+        if (StringUtils.isBlank(safetyHatAlarm.getAlarmInfo())) {
-        safetyHatAlarm.setAlarmInfo(str);
+            String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
+            safetyHatAlarm.setAlarmInfo(str);
+        }
         safetyHatAlarm.setWorkerInfoId(dev.getWorkerInfoId());
         safetyHatAlarm.setProjectSn(dev.getProjectSn());
         safetyHatAlarm.setId(null);

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

@@ -122,14 +122,16 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
         safetyHatData.setWorkerInfoId(dev.getWorkerInfoId());
         baseMapper.insert(safetyHatData);
 
-        //超过围栏报警，只要在一个围栏内就不报警
+        if (dev.getType() == 1) {
-        List<SafetyHatFence> fenceList = safetyHatFenceMapper.selectList(new LambdaQueryWrapper<SafetyHatFence>()
+            //超过围栏报警，只要在一个围栏内就不报警
-                .eq(SafetyHatFence::getProjectSn, dev.getProjectSn()));
+//            List<SafetyHatFence> fenceList = safetyHatFenceMapper.selectList(new LambdaQueryWrapper<SafetyHatFence>()
-        if (CollUtil.isNotEmpty(fenceList)) {
+//                    .eq(SafetyHatFence::getProjectSn, dev.getFenceId()));
-            boolean isInFence = false;
+            SafetyHatFence fence = safetyHatFenceMapper.selectById(dev.getFenceId());
-            boolean inFence = false;
+            if (fence != null) {
-            for (SafetyHatFence fence : fenceList) {
+                boolean isInFence = false;
-                //判断是否在围栏范围内
+                boolean inFence = false;
+//                for (SafetyHatFence fence : fenceList) {
+                    //判断是否在围栏范围内
                 if (Objects.equals(fence.getRangeType(), 1)) {
                     isInFence = RegionUtil.isInCircle(safetyHatData.getLongitude(), safetyHatData.getLatitude(), fence.getLongitude(), fence.getLatitude(), fence.getAreaRadius());
                 } else if (Objects.equals(fence.getRangeType(), 2)) {
@@ -150,16 +152,17 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
                 if (isInFence) {
                     inFence = true;
                 }
-            }
+//                }
-            if (!inFence) {
+                if (!inFence) {
-                SafetyHatAlarm alarm = new SafetyHatAlarm();
+                    SafetyHatAlarm alarm = new SafetyHatAlarm();
-                alarm.setDevSn(dev.getDevSn());
+                    alarm.setDevSn(dev.getDevSn());
-                alarm.setAlarmTime(new Date());
+                    alarm.setAlarmTime(new Date());
-                alarm.setAlarmType(2);
+                    alarm.setAlarmType(2);
-                alarm.setLatitude(safetyHatData.getLatitude());
+                    alarm.setLatitude(safetyHatData.getLatitude());
-                alarm.setLongitude(safetyHatData.getLongitude());
+                    alarm.setLongitude(safetyHatData.getLongitude());
-                alarm.setFenceId(dev.getFenceId());
+                    alarm.setFenceId(dev.getFenceId());
-                safetyHatAlarmService.add(alarm);
+                    safetyHatAlarmService.add(alarm);
+                }
             }
         }
     }

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

@@ -138,7 +138,7 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
 
     @Override
     @Transactional(rollbackFor = Exception.class, noRollbackFor = OpenPromptException.class)
-    public void importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception {
+    public void importExcelTemplate(MultipartFile excelFile, String projectSn, Integer type) throws Exception {
         List<SafetyHatFence> safetyHatFenceList = safetyHatFenceMapper.selectList(Wrappers.<SafetyHatFence>lambdaQuery()
                 .eq(SafetyHatFence::getProjectSn, projectSn));
         if (StrUtil.isBlank(projectSn)) {
@@ -184,6 +184,7 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
                 dev.setDevSn(devSn);
                 dev.setProjectSn(projectSn);
                 dev.setFenceId(String.valueOf(fenceId));
+                dev.setType(type);
                 baseMapper.insert(dev);
             }
         });

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

@@ -156,6 +156,7 @@ public class SafetyHatTask {
                             data.setUploadTime(new Date(time * 1000L));
                             data.setProjectSn(dev.getProjectSn());
                             data.setIsPlatformData(1);
+                            data.setType(dev.getType());
                             safetyHatDataService.add(data);
                         }
                     } else {