From 71b7fd1419ad2bde77b10a34dec742915b172878 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 17 Jun 2024 15:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E7=8E=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/vo/ConstructionQualityVo.java      | 14 ++++++++++++
 .../controller/OperatingController.java       | 15 +++++++++++++
 .../screen/mapper/OperatingMapper.java        |  7 ++++++
 .../screen/service/OperatingService.java      |  7 ++++++
 .../screen/service/impl/OperatingImpl.java    |  5 +++++
 .../main/resources/mapper/OperatingMapper.xml | 22 +++++++++++++++++--
 6 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java
index d97f26f..ccd2cf8 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java
@@ -67,6 +67,20 @@ public class ConstructionQualityVo {
     @ApiModelProperty(value = "告警时间")
     private String warnTime;
 
+    private String userName;
+    /**
+     * 血压
+     */
+    private String xy;
+    /**
+     * 温度
+     */
+    private String wd;
+    /**
+     * 心率
+     */
+    private String xl;
+
 
 
 
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java
index 88cab6d..42a7215 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java
@@ -115,4 +115,19 @@ public class OperatingController extends BaseController {
     }
 
 
+    @ApiOperation(value = "作业环境-人员手环检测")
+    @GetMapping("getUserShList")
+    public TableDataInfo getUserShList(ConstructionQualityDto dto) {
+        try{
+            startLayPage();
+            List<ConstructionQualityVo> list = service.getUserShList(dto);
+            return getDataTableLayui(list);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+            return getDataTableBadLayui(new ArrayList<>(),"请求出错了");
+        }
+    }
+
+
+
 }
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 1c46883..10efdbd 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
@@ -83,4 +83,11 @@ public interface OperatingMapper {
      * @date 2024/3/27 19:54
      */
     List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto);
+
+    /**
+     * 手环列表
+     * @param dto
+     * @return
+     */
+    List<ConstructionQualityVo> getUserShList(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 d8d0d0f..8e6a40a 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
@@ -81,4 +81,11 @@ public interface OperatingService {
      * @date 2024/3/27 19:54
      */
     List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto);
+
+    /**
+     * 人员手环 查询
+     * @param dto
+     * @return
+     */
+    List<ConstructionQualityVo> getUserShList(ConstructionQualityDto dto);
 }
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 8f27a4d..ed41b6d 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
@@ -117,4 +117,9 @@ public class OperatingImpl implements OperatingService {
     public List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto) {
         return mapper.getSlopeDisplacementList(dto);
     }
+
+    @Override
+    public List<ConstructionQualityVo> getUserShList(ConstructionQualityDto dto) {
+        return mapper.getUserShList(dto);
+    }
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
index bf5ecbd..1c48dec 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
@@ -73,7 +73,7 @@
         LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
         LEFT JOIN tb_bd_device tbd on tdd.device_id = tbd.device_id
         LEFT JOIN tb_pro_bd tpb on tbd.bd_id = tpb.id
-        WHERE  tdd.device_id=#{deviceId}
+        WHERE  tdd.device_id=#{deviceId} and tdd.del_flag=0
     </select>
 
     <!--作业环境-GPS安装检测设备查询-->
@@ -87,7 +87,7 @@
             LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
             LEFT JOIN tb_bd_device tbd on tdd.device_id = tbd.device_id
             LEFT JOIN tb_pro_bd tpb on tbd.bd_id = tpb.id
-            WHERE    tdd.device_id=#{deviceId}
+            WHERE    tdd.device_id=#{deviceId}  and tdd.del_flag=0
         and  tpb.bid_code = #{bidCode}
     </select>
 
@@ -113,4 +113,22 @@
             AND tbd.device_id LIKE CONCAT('%', #{deviceId}, '%')
         </if>
     </select>
+    <select id="getUserShList" resultType="com.securitycontrol.entity.screen.vo.ConstructionQualityVo">
+        select tbd.device_name deviceName,
+               tdv.val   userName,
+               CONCAT(tdv2.val,tdv2.unit) xl,
+               CONCAT(tdv3.val,tdv3.unit) xy,
+               CONCAT(tdv4.val,tdv4.unit) wd
+        from  tb_bd_device tbd
+                  left join  tb_device_detail tdd on   tdd.device_id = tbd.device_id and tdd.device_code='name'
+                  LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
+                  left join  tb_device_detail tdd2 on   tdd2.device_id = tbd.device_id and tdd2.device_code='pulse'
+                  LEFT JOIN tb_device_value tdv2 ON tdd2.id = tdv2.attribute_id
+                  left join  tb_device_detail tdd3 on   tdd3.device_id = tbd.device_id and tdd3.device_code='BloodPressure'
+                  LEFT JOIN tb_device_value tdv3 ON tdd3.id = tdv3.attribute_id
+                  left join  tb_device_detail tdd4 on   tdd4.device_id = tbd.device_id and tdd4.device_code='temperature'
+                  LEFT JOIN tb_device_value tdv4 ON tdd4.id = tdv4.attribute_id
+        where  tbd.devic_type =1903
+
+    </select>
 </mapper>
\ No newline at end of file