Merge remote-tracking branch 'origin/develop' into develop

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;

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>