diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java index f561767..78703df 100644 --- a/src/main/java/com/hisense/monitormanage/controller/Controller.java +++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java @@ -1,5 +1,6 @@ package com.hisense.monitormanage.controller; +import com.hisense.monitormanage.dto.ChannelLabelDto; import com.hisense.monitormanage.dto.ChengguanDto; import com.hisense.monitormanage.dto.ScenicCameraDto; import com.hisense.monitormanage.entity.CameraChannel; @@ -133,6 +134,11 @@ public class Controller { return monitorService.reverseGeocode(map); } + /** + * 查询摄像头 + * @param cameraChannel + * @return + */ @RequestMapping("selectAll") public Result selectAll(CameraChannel cameraChannel){ @@ -154,6 +160,19 @@ public class Controller { return success; + } + /** + * 根据标签查询对应摄像头 + * @return + */ + @RequestMapping("selectLabel") + public Result selectLabel(String labelCode){ + + List channelLabelDtos = cameraChannelMapper.selectLabel(labelCode); + + Result success = Result.success(channelLabelDtos); + + return success; } } diff --git a/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java new file mode 100644 index 0000000..399bb25 --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java @@ -0,0 +1,27 @@ +package com.hisense.monitormanage.dto; + +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/entity/Label.java b/src/main/java/com/hisense/monitormanage/entity/Label.java new file mode 100644 index 0000000..c65d9cc --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/entity/Label.java @@ -0,0 +1,15 @@ +package com.hisense.monitormanage.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("t_label") +public class Label { + @TableId + private Long id; + private String labelCode; + private String labelName; + +} diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index 367d767..936962f 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -1,6 +1,8 @@ package com.hisense.monitormanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.monitormanage.dto.ChannelLabelDto; +import com.hisense.monitormanage.dto.ChengguanDto; import com.hisense.monitormanage.entity.CameraChannel; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -8,12 +10,16 @@ import org.apache.ibatis.annotations.Select; import java.util.List; public interface CameraChannelMapper extends BaseMapper { - @Select("select c.* from t_camera_channel c where (c.gps_x NOT IN('0.0','0','') OR c.gps_y NOT IN('0.0','0','')) AND c.status != 0") + @Select("select c.* from t_camera_channel c where (c.gps_x NOT IN('0.0','0','') " + + "OR c.gps_y NOT IN('0.0','0','')) AND c.status != 0") List selectAll(CameraChannel cameraChannel); @Select("select * from t_camera_channel where idt_camera_channel = #{idtCameraChannel}") List selectById(@Param("idtCameraChannel") String idtCameraChannel); + @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 ) m where m.label_code = #{labelCode} ") + List selectLabel(@Param("labelCode") String labelCode); diff --git a/src/main/resources/mapper/CameraChannelMapper.xml b/src/main/resources/mapper/CameraChannelMapper.xml new file mode 100644 index 0000000..f769d84 --- /dev/null +++ b/src/main/resources/mapper/CameraChannelMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file