From aa34980973439be8e475fc311eb9fd01099a89fb Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Thu, 18 Jan 2024 09:24:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E6=95=85=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/DcTrafficIncidentsMapper.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
index 1587360d..d4eacf37 100644
--- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
@@ -302,7 +302,7 @@
                     else TIMESTAMPDIFF(MINUTE,start_time,end_time)
                     end) minuteTime
              from dc_event
-             where event_type = '1'
+             where event_type = '1' and direction = #{direction}
                 <if test="type != null and type == '1'.toString">
                     and DATE_FORMAT(start_time,'%Y%m%d') = DATE_FORMAT(#{startTime},'%Y%m%d')
                 </if>
@@ -324,7 +324,7 @@
                     else TIMESTAMPDIFF(MINUTE,start_time,end_time)
                     end) minuteTime
              from dc_event
-             where event_type = '1'
+             where event_type = '1' and direction = #{direction}
                 <if test="type != null and type == '1'.toString">
                     and DATE_FORMAT(start_time,'%Y%m%d') = DATE_FORMAT(DATE_SUB(#{startTime},INTERVAL 1 DAY),'%Y%m%d')
                 </if>

From 66cc89c34a313e1ad8ad3a5464a3d497234df0c0 Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Thu, 18 Jan 2024 09:48:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zc/business/controller/VideoController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/VideoController.java b/zc-business/src/main/java/com/zc/business/controller/VideoController.java
index 9593991d..d3cdf7f7 100644
--- a/zc-business/src/main/java/com/zc/business/controller/VideoController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/VideoController.java
@@ -176,7 +176,7 @@ public class VideoController extends BaseController {
     @ApiOperation("云平台控制")
     @GetMapping(value = "/PTZControl")
     public JSONObject PTZControl(@ApiParam(value = "相机id", name = "camId", required = true) String camId,
-                                 @ApiParam(value = "相机类型", name = "cmdType", required = true) String cmdType,
+                                 @ApiParam(value = "指令类型", name = "cmdType", required = true) String cmdType,
                                  @ApiParam(value = "速度", name = "speed", required = true) String speed) throws HttpException, IOException {
 
         JSONObject jsonResult = null;