From 669026e94f38a0b1f34bdf810ed21510624fb6b8 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 17 Jun 2024 14:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/screen/dto/OperatingQualityDto.java     |  2 ++
 .../entity/screen/vo/OperatingQualityVo.java       |  2 ++
 .../src/main/resources/mapper/OperatingMapper.xml  | 14 ++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/OperatingQualityDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/OperatingQualityDto.java
index 2b037bd..624a5dd 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/OperatingQualityDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/OperatingQualityDto.java
@@ -30,4 +30,6 @@ public class OperatingQualityDto extends ScreenParamDto {
 
     @ApiModelProperty(value = "设备ID")
     private String deviceId;
+
+    private String deviceType;
 }
diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java
index b50c7b1..b3f7f8a 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java
@@ -46,6 +46,8 @@ public class OperatingQualityVo {
     @ApiModelProperty(value = "单位")
     private String unit;
 
+    private String deviceType;
+
 
 
 
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 02381e8..bf5ecbd 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
@@ -44,7 +44,7 @@
         LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
         LEFT JOIN tb_device_value thdv ON tdd.id = thdv.attribute_id
         LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
-        WHERE    tbd.devic_type = 1908  and  tpb.bid_code = #{bidCode}   and tbd.del_flag=0
+        WHERE    tbd.devic_type = #{deviceType}  and  tpb.bid_code = #{bidCode}   and tbd.del_flag=0
             <if test="deviceId!=null and deviceId!=''">
                and   tbd.device_id=#{deviceId}
             </if>
@@ -54,13 +54,12 @@
     <!--作业环境-GPS安装检测-->
     <select id="getGisInstallation" resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
         SELECT
-            tbd.device_id AS id,
+            tbd.device_id AS deviceId,
             tbd.device_name AS deviceName,
             tbd.status AS status
         FROM   tb_bd_device tbd
         LEFT JOIN tb_pro_bd tpb ON  tpb.id = tbd.bd_id
-        WHERE  tbd.devic_type = 1910 and tpb.bid_code = #{bidCode}
-
+        WHERE  tbd.devic_type = #{deviceType} and tpb.bid_code = #{bidCode}
     </select>
 
     <!--作业环境-有限空间检测环境-->
@@ -74,22 +73,21 @@
         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  tbd.devic_type =1909
-        and  tpb.bid_code = #{bidCode}
+        WHERE  tdd.device_id=#{deviceId}
     </select>
 
     <!--作业环境-GPS安装检测设备查询-->
     <select id="getGisInstallationEnvironment"
             resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
         SELECT
-             tdv.val  val,
+            tdv.val  val,
             tdv.unit,
             tdd.mode_name AS modeName
             FROM tb_device_detail tdd
             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  tbd.devic_type =1910
+            WHERE    tdd.device_id=#{deviceId}
         and  tpb.bid_code = #{bidCode}
     </select>