代码规范修改

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java

@@ -31,6 +31,21 @@ public class OperatingQualityVo {
     @ApiModelProperty("设备状态")
     private String status;
 
+    @ApiModelProperty(value = "变化值")
+    private String changeVal;
+
+    @ApiModelProperty(value = "原数据")
+    private String sourceData;
+
+    @ApiModelProperty(value = "区域名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "区域名称")
+    private String createTime;
+
+
+
+
 
 
 }

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml

@@ -95,6 +95,7 @@
             thdv.change_val AS changeVal,
             thdv.create_time AS createTime,
             thdv.source_data AS sourceData,
+            thdv.is_warn AS isWarn
             FROM tb_bd_device tbd
             JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
             JOIN tb_area ta ON tbd.area_id = ta.area_id

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml

@@ -12,7 +12,7 @@
             FROM t_team_people ttp
                 JOIN sys_user su ON ttp.user_id = su.user_id
                 JOIN tb_work_team twt ON ttp.team_id = twt.team_id
-                JOIN tb_user_bind_cap tuc ON ttp.user_id = tuc.cop_id
+                JOIN tb_user_bind_cap tuc ON ttp.user_id = tuc.people_id
                 JOIN tb_device tbd ON tuc.device_id = tbd.device_id
                 JOIN tb_rel_device trd ON tbd.device_id = trd.device_id
         WHERE twt.bid_code = #{bidCode}