From bd038a0c22f7ca89f494b83ed5e03ca80f599ca0 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Thu, 12 May 2022 11:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hisense/monitormanage/dto/ChannelLabelDto.java | 10 ---------- .../monitormanage/mapper/CameraChannelMapper.java | 5 +++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java index 399bb25..f0d9ff2 100644 --- a/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java +++ b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java @@ -4,24 +4,14 @@ import lombok.Data; @Data public class ChannelLabelDto { - private String labelCode; - - private String labelName; private String channelCode; - private String channelId; - - private String channelName; - private String gpsX; private String gpsY; - private Integer status;//1在线；0离线 - private String nodeName; - private Integer checkStatus;//1正常；0异常 } diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index 41e0e58..b91a203 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -21,8 +21,8 @@ public interface CameraChannelMapper extends BaseMapper { @Select("select * from t_camera_channel where parent_id = #{parentId}") List selectByParentId(@Param("parentId") String parentId); - @Select("select * from (select a.*,c.* from t_channel_mtm_label b JOIN t_label a JOIN t_camera_channel c " + - "ON a.label_code = b.label_code AND b.channel_code = c.channel_code where c.`status`!= 0) m where m.label_code = #{labelCode} ") + @Select("select c.channel_code,c.gps_x,c.gps_y,c.node_name from t_camera_channel c where channel_code in " + + "(select b.channel_code from t_channel_mtm_label b where b.label_code = #{labelCode}) ") List selectLabel(@Param("labelCode") String labelCode); //@Update("update t_camera_channel set state = list") void updateState(@Param("list") List list); @@ -41,4 +41,5 @@ public interface CameraChannelMapper extends BaseMapper { List selectLabelAndChannel(@Param("labelCode") String labelCode,@Param("labelCode1") String labelCode1); + }