From 7172d287c9c4cb689e80988490dbe7f6f9c6a49f Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Sat, 20 Apr 2024 12:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/securitycontrol/entity/screen/vo/DeviceValueVo.java | 6 ++++++
 .../src/main/resources/mapper/XcIndexMapper.xml             | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DeviceValueVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DeviceValueVo.java
index 9db2041..6bb6feb 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DeviceValueVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DeviceValueVo.java
@@ -45,4 +45,10 @@ public class DeviceValueVo {
      * 是否告警
      */
     private String isWarn;
+    /**
+     * 单位
+     */
+    private String unit;
+
+
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
index c274400..268fa9f 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
@@ -9,14 +9,14 @@
     </select>
     <!--查询环境检测数据-->
     <select id="getProJcData" resultType="com.securitycontrol.entity.screen.vo.DeviceValueVo">
-            select bdd.device_name deviceName,tdd.mode_name modelName,
-                    tdv.val,tdv.is_warn isWarn,tdv.create_time createTime,sd.dict_name deviceType
+            select bdd.device_name deviceName,tdd.mode_name modelName,tdv.unit,
+        tdv.val,tdv.is_warn isWarn,tdv.create_time createTime,sd.dict_name deviceType
                 from tb_pro_bd bd
                 INNER join tb_bd_device bdd on bdd.bd_id=bd.id and bdd.del_flag=0
                 LEFT JOIN sys_dict sd on sd.dict_code=bdd.devic_type
                 left join tb_device_detail tdd on tdd.device_id=bdd.device_id and tdd.del_flag=0
                 left join tb_device_value tdv on tdd.id=tdv.attribute_id
-                where    tdd.mode_name is not null and  sd.dict_code=#{typeCode}
+                where    tdd.mode_name is not null and   bdd.devic_type=1902
                 and bd.bid_code=#{bidCode}
     </select>
     <select id="getWeekRiskNum" resultType="java.lang.Integer">