From d45e9b728368cc124d0fd4eec9e1720f8a5b815f Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 3 Apr 2024 18:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/screen/vo/PersonnelControlVo.java  |  7 +++
 .../screen/mapper/OperatingMapper.java        | 48 +++++++++++++++
 .../screen/service/OperatingService.java      | 12 ++--
 .../screen/service/impl/OperatingImpl.java    | 58 ++++++++++++++++++-
 .../mapper/PersonnelControlMapper.xml         | 23 ++++----
 5 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
index eff6d2a..330c56a 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
@@ -73,6 +73,13 @@ public class PersonnelControlVo {
     @ApiModelProperty("手机号")
     private String phone;
 
+    @ApiModelProperty("监测名称")
+    private String modeName;
 
+    @ApiModelProperty("采集值")
+    private String val;
+
+    @ApiModelProperty("组织机构")
+    private String orgName;
 
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java
index 4cfd750..7b83670 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java
@@ -20,15 +20,63 @@ public interface OperatingMapper {
      */
     List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-有限空间检测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-边坡位移监测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-GPS安装检测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-有限空间检测环境
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-GPS安装检测环境查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
 
+    /**
+     * 作业环境-边坡位移监测列表
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto);
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java
index 1283f74..bf59ecc 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java
@@ -23,7 +23,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-有限空间检测设备查询
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
@@ -33,7 +33,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-边坡位移监测设备查询
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
@@ -43,7 +43,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-GPS安装检测设备查询
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
@@ -53,7 +53,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-有限空间检测环境
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
@@ -63,7 +63,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-GPS安装检测环境查询
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
@@ -73,7 +73,7 @@ public interface OperatingService {
     List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
 
     /**
-     * 作业环境-实时检测
+     * 作业环境-边坡位移监测列表
      * @param dto
      * @return List<OperatingQualityVo>
      * @description
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java
index 8b0ae6c..1265179 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java
@@ -26,37 +26,93 @@ public class OperatingImpl implements OperatingService {
     @Resource(name = "OperatingMapper")
     private OperatingMapper mapper;
 
-
+    /**
+     * 作业环境-实时检测
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * &#064;description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto) {
         return mapper.getRealTimeMonitoring(dto);
     }
 
+    /**
+     * 作业环境-有限空间检测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto) {
         return mapper.getFiniteSpace(dto);
     }
 
+    /**
+     * 作业环境-边坡位移监测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto) {
         return mapper.getSlopeDisplacement(dto);
     }
 
+
+    /**
+     * 作业环境-GPS安装检测设备查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto) {
         return mapper.getGPSInstallation(dto);
     }
 
+    /**
+     * 作业环境-有限空间检测环境
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto) {
         return mapper.getFiniteSpaceEnvironment(dto);
     }
 
+    /**
+     * 作业环境-GPS安装检测环境查询
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto) {
         return mapper.getGPSInstallationEnvironment(dto);
     }
 
+    /**
+     * 作业环境-边坡位移监测列表
+     * @param dto
+     * @return List<OperatingQualityVo>
+     * @description
+     * @author jjLv
+     * @date 2024/3/27 19:54
+     */
     @Override
     public List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto) {
         return mapper.getSlopeDisplacementList(dto);
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
index 59c0cf1..68c7439 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
@@ -110,18 +110,21 @@
     </select>
     <select id="personnelCoordinatePoint" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
         SELECT
-            tct.user_id AS userId,
-            su.user_name AS userName,
-            su.dept_name AS deptName,
-            su.phone AS phone,
-            tct.lat AS latitude,
-            tct.lon AS longitude
+            tbd.device_id AS deviceId,
+            group_concat(tdd.mode_name) AS modeName,
+            group_concat(tdv.val) AS val,
+            group_concat(su.phone) AS phone,
+            group_concat(su.org_name) AS orgName,
+            group_concat(su.user_name) AS userName
         FROM
-            tb_cap_travel tct
-                LEFT JOIN tb_bd_device tbd ON tct.device_id = tbd.device_id
+            tb_bd_device tbd
                 LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
-                LEFT JOIN sys_user su ON tct.user_id = su.user_id
+                LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
+                LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
+                LEFT JOIN sys_user su ON tdv.val = su.user_id and tdd.mode_name = '绑定人'
         WHERE
-            tpb.bid_code = #{bidCode}
+            tpb.bid_code = #{bidCode} and tbd.devic_type = '1905'
+        GROUP BY
+            tbd.device_id
     </select>
 </mapper>
\ No newline at end of file