From 20b3d50c5eb731595ddca356edda709f752de88b Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 1 Apr 2024 13:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/screen/vo/OperatingQualityVo.java | 15 +++++++++++++++ .../src/main/resources/mapper/OperatingMapper.xml | 1 + .../resources/mapper/PersonnelControlMapper.xml | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) 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 19b7bd3..687860f 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 @@ -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; + + + + } 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 572d15f..230849a 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml +++ b/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 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index 87d8952..d8c80b4 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/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}