From 85157456b861b8e299399d9f8a316379361527bd Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Thu, 26 May 2022 10:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=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

---
 .../hisense/monitormanage/controller/Controller.java   | 10 ++++++----
 .../monitormanage/mapper/CameraChannelMapper.java      |  2 +-
 .../hisense/monitormanage/service/MonitorService.java  |  2 +-
 src/main/resources/mapper/CameraChannelMapper.xml      |  9 +++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java
index 8576808..1bf8807 100644
--- a/src/main/java/com/hisense/monitormanage/controller/Controller.java
+++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java
@@ -114,7 +114,7 @@ public class Controller {
 
     @GetMapping("capture1")
     public Object capture1(){
-        monitorService.screenShot1();
+        monitorService.listChannelPlayStates();
 
         return "finish capture";
     }
@@ -292,10 +292,12 @@ public class Controller {
     @ApiOperation("提供给其他项目分页查询摄像头接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page",value = "页码",required = true,dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize",value = "页码大小",required = true,dataType = "Integer")
+            @ApiImplicitParam(name = "pageSize",value = "页码大小",required = true,dataType = "Integer"),
+            @ApiImplicitParam(name = "labelCode",value = "标签号",required = false,dataType = "String")
     })
-    public Result selectNLAll(Integer page,Integer pageSize){
-        List<CameraChannelNLDto> selectNLAll = cameraChannelMapper.selectNLAll(page,pageSize);
+    public Result selectNLAll(Integer page,Integer pageSize,String labelCode){
+        List<CameraChannelNLDto> selectNLAll = cameraChannelMapper.selectNLAll(page,pageSize,labelCode);
+
         Result success = Result.success(selectNLAll);
         return success;
     }
diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
index 3009d1a..4e02489 100644
--- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
+++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
@@ -52,6 +52,6 @@ public interface CameraChannelMapper extends BaseMapper<CameraChannel> {
                                           @Param("gpsY1") Double gpsY1);
 
 
-    List<CameraChannelNLDto> selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize);
+    List<CameraChannelNLDto> selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize,@Param("labelCode") String labelCode);
 
 }
diff --git a/src/main/java/com/hisense/monitormanage/service/MonitorService.java b/src/main/java/com/hisense/monitormanage/service/MonitorService.java
index 86a9695..5009e90 100644
--- a/src/main/java/com/hisense/monitormanage/service/MonitorService.java
+++ b/src/main/java/com/hisense/monitormanage/service/MonitorService.java
@@ -791,7 +791,7 @@ public class MonitorService {
         //获取当前时间和前一天的UTC时间
         Map<String,Object> condition = new HashMap<>();
         ZonedDateTime endUTC = ZonedDateTime.now(ZoneOffset.UTC);
-        ZonedDateTime startUTC = endUTC.minusDays(30);
+        ZonedDateTime startUTC = endUTC.minusDays(60);
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'");
         condition.put("checkStatus",0);
         condition.put("startTime",dateTimeFormatter.format(startUTC));
diff --git a/src/main/resources/mapper/CameraChannelMapper.xml b/src/main/resources/mapper/CameraChannelMapper.xml
index b2bd95e..75a37fd 100644
--- a/src/main/resources/mapper/CameraChannelMapper.xml
+++ b/src/main/resources/mapper/CameraChannelMapper.xml
@@ -25,9 +25,14 @@
     </update>
 
     <select id="selectNLAll" resultType="com.hisense.monitormanage.dto.CameraChannelNLDto">
-        SELECT a.label_name,d.* from t_label a JOIN (select b.label_code,c.* from t_camera_channel c
-        JOIN t_channel_mtm_label b on c.channel_code = b.channel_code where label_code != '') d
+        SELECT a.label_name,d.* from t_label a RIGHT JOIN (select b.label_code,c.* from t_camera_channel c
+        LEFT JOIN t_channel_mtm_label b on c.channel_code = b.channel_code) d
          on d.label_code = a.label_code
+          <where>
+              <if test="labelCode != null and labelCode != ''">
+                  d.label_code = #{labelCode}
+              </if>
+          </where>
         <bind name="page" value="(page-1)*pageSize"/>
         limit #{page},#{pageSize}
     </select>