From 0dbf4dce47d9b22194d976aefa75a13fcc39634e Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 19 Sep 2024 14:33:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyHatDevController.java | 24 +++++++++++++++++++ .../safetyhat/entity/SafetyHatAlarm.java | 14 ++++++++++- .../safetyhat/entity/SafetyHatDev.java | 15 ++++++++++++ .../safetyhat/entity/vo/QueryFenceTreeVo.java | 17 +++++++++++++ .../mapper/xml/SafetyHatAlarmMapper.xml | 3 ++- .../mapper/xml/SafetyHatDevMapper.xml | 3 ++- .../impl/SafetyHatDataServiceImpl.java | 1 + .../com/zhgd/xmgl/task/SafetyHatTask.java | 5 +++- 8 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/vo/QueryFenceTreeVo.java 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 eb11591a0..c0f0243bb 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 @@ -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> queryFenceTreeList(@ApiIgnore @RequestParam HashMap paramMap) { + List safetyHatDevs = safetyHatDevService.queryList(paramMap); + List safetyHatFences = safetyHatFenceService.queryList(paramMap); + List 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); + } } 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 1fed1778b..a26a0cbf7 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 @@ -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; } 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 a9b23722f..267f65242 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 @@ -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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/vo/QueryFenceTreeVo.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/vo/QueryFenceTreeVo.java new file mode 100644 index 000000000..49059883f --- /dev/null +++ b/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 safetyHatDevs; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml index dde40884b..1d36114e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml @@ -2,9 +2,10 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml index f9d057382..32d56356b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml @@ -2,9 +2,10 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java index 5c65e59d3..111732585 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java @@ -158,6 +158,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl