From 9f995931c2776a8494100b7f2acca27399c61129 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 20 Sep 2024 16:43:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=A6=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/config/SafetyHatWSClient.java | 4 ++ .../java/com/zhgd/xmgl/enums/ParamEnum.java | 4 ++ .../controller/SafetyHatDevController.java | 4 +- .../safetyhat/entity/SafetyHatAlarm.java | 6 +++ .../safetyhat/entity/SafetyHatData.java | 7 ++++ .../safetyhat/entity/SafetyHatDev.java | 7 ++++ .../service/ISafetyHatDevService.java | 2 +- .../impl/SafetyHatAlarmServiceImpl.java | 6 ++- .../impl/SafetyHatDataServiceImpl.java | 39 ++++++++++--------- .../service/impl/SafetyHatDevServiceImpl.java | 3 +- .../com/zhgd/xmgl/task/SafetyHatTask.java | 1 + 11 files changed, 59 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java index 1f780263e..05de7fb46 100644 --- a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java +++ b/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) { diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index de5517498..411102cda 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -1315,6 +1315,10 @@ public class ParamEnum { * 血压报警 */ XYBJ(22, "血压报警"), + /** + * 双钩均未挂接 + */ + AQDBJ(27, "双钩均未挂接"), ; private Integer value; diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java index c0f0243bb..76e96b186 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java +++ b/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 { - safetyHatDevService.importExcelTemplate(file, projectSn); + public Result importExcelTemplate(MultipartFile file, String projectSn, Integer type) throws Exception { + safetyHatDevService.importExcelTemplate(file, projectSn, type); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java index a26a0cbf7..cb7877419 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java +++ b/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; /** * 人员名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java index dbce8d6f5..2d48b04f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java +++ b/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; + /** * 人员名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java index 267f65242..4df7ef9d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java +++ b/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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java index 48c0c667f..3c4af5ab7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java @@ -73,5 +73,5 @@ public interface ISafetyHatDevService extends IService { * @param projectSn * @throws Exception */ - void importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception; + void importExcelTemplate(MultipartFile excelFile, String projectSn, Integer type) throws Exception; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java index 837078cae..3c7cf10dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java @@ -82,8 +82,10 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl fenceList = safetyHatFenceMapper.selectList(new LambdaQueryWrapper() - .eq(SafetyHatFence::getProjectSn, dev.getProjectSn())); - if (CollUtil.isNotEmpty(fenceList)) { - boolean isInFence = false; - boolean inFence = false; - for (SafetyHatFence fence : fenceList) { - //判断是否在围栏范围内 + if (dev.getType() == 1) { + //超过围栏报警，只要在一个围栏内就不报警 +// List fenceList = safetyHatFenceMapper.selectList(new LambdaQueryWrapper() +// .eq(SafetyHatFence::getProjectSn, dev.getFenceId())); + SafetyHatFence fence = safetyHatFenceMapper.selectById(dev.getFenceId()); + if (fence != null) { + 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 safetyHatFenceList = safetyHatFenceMapper.selectList(Wrappers.lambdaQuery() .eq(SafetyHatFence::getProjectSn, projectSn)); if (StrUtil.isBlank(projectSn)) { @@ -184,6 +184,7 @@ public class SafetyHatDevServiceImpl extends ServiceImpl