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
and tbd.device_id=#{deviceId}
@@ -54,13 +54,12 @@
@@ -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}