Merge remote-tracking branch 'origin/dev-2.15.0' into dev-2.15.0

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -26,6 +26,7 @@
     <result column="channel_number" property="channelNumber" jdbcType="VARCHAR" />
     <result column="isremove" property="isremove" jdbcType="VARCHAR" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="warn_time" property="warnTime" jdbcType="TIMESTAMP" />
     <result column="camera_index_code" property="cameraIndexCode" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="INTEGER" />
     <result column="status_name" property="statusName" jdbcType="VARCHAR" />
@@ -91,7 +92,7 @@
   <sql id="Base_Column_List" >
     id, org_id, nvr_id, name, alias, username, password, ip, subnetmask, gateway, type, 
     port, factory, live, model_number, serial_number, installation_site, installation_method, 
-    Irradiated_area, power_position, remark, channel_number, isremove, update_time,camera_index_code,status,status_name
+    Irradiated_area, power_position, remark, channel_number, isremove, update_time,warn_time,camera_index_code,status,status_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.MonitorCameraExample" >
     select
@@ -140,7 +141,7 @@
       factory, live, model_number, 
       serial_number, installation_site, installation_method, 
       Irradiated_area, power_position, remark, 
-      channel_number, isremove, update_time,camera_index_code,status,status_name
+      channel_number, isremove, update_time,warn_time,camera_index_code,status,status_name
       )
     values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR}, #{nvrId,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{alias,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
@@ -149,7 +150,9 @@
       #{factory,jdbcType=VARCHAR}, #{live,jdbcType=VARCHAR}, #{modelNumber,jdbcType=VARCHAR}, 
       #{serialNumber,jdbcType=VARCHAR}, #{installationSite,jdbcType=VARCHAR}, #{installationMethod,jdbcType=VARCHAR}, 
       #{irradiatedArea,jdbcType=VARCHAR}, #{powerPosition,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{channelNumber,jdbcType=VARCHAR}, #{isremove,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},#{cameraIndexCode},#{status},#{statusName}
+      #{channelNumber,jdbcType=VARCHAR}, #{isremove,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+   #{warnTime,jdbcType=TIMESTAMP},
+ #{cameraIndexCode},#{status},#{statusName}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.MonitorCamera" >
@@ -227,6 +230,9 @@
       <if test="updateTime != null" >
         update_time,
       </if>
+      <if test="warnTime != null" >
+        warn_time,
+      </if>
       <if test="cameraIndexCode != null" >
         camera_index_code,
       </if>
@@ -310,6 +316,9 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="warnTime != null" >
+        #{warnTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="cameraIndexCode != null" >
         #{cameraIndexCode,jdbcType=VARCHAR},
       </if>
@@ -402,6 +411,9 @@
       <if test="record.updateTime != null" >
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.warnTime != null" >
+        warn_time=#{record.warnTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.cameraIndexCode != null" >
         camera_index_code=#{cameraIndexCode,jdbcType=VARCHAR},
       </if>
@@ -442,6 +454,7 @@
       channel_number = #{record.channelNumber,jdbcType=VARCHAR},
       isremove = #{record.isremove,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      warn_time=#{warnTime,jdbcType=TIMESTAMP},
     camera_index_code=#{cameraIndexCode,jdbcType=VARCHAR},
     status=#{status,jdbcType=INTEGER},
     status_name = #{statusName,jdbcType=VARCHAR}
@@ -521,6 +534,9 @@
       <if test="updateTime != null" >
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="warnTime != null" >
+          warn_time=#{warnTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="cameraIndexCode != null" >
         camera_index_code=#{cameraIndexCode,jdbcType=VARCHAR},
       </if>
@@ -560,6 +576,7 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
         camera_index_code=#{cameraIndexCode,jdbcType=VARCHAR},
         status=#{status,jdbcType=INTEGER},
+        warn_time=#{warnTime,jdbcType=TIMESTAMP},
         status_name = #{statusName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>

src/main/java/com/chinaitop/depot/basic/model/MonitorCamera.java

@@ -52,6 +52,8 @@ public class MonitorCamera implements Serializable {
 
     private Date updateTime;
 
+    private Date warnTime;
+
     private String storehouseId;
 
     private String cameraIndexCode;
@@ -90,6 +92,14 @@ public class MonitorCamera implements Serializable {
         this.statusName = statusName;
     }
 
+    public Date getWarnTime() {
+        return warnTime;
+    }
+
+    public void setWarnTime(Date warnTime) {
+        this.warnTime = warnTime;
+    }
+
     public String getCameraIndexCode() {
         return cameraIndexCode;
     }

src/main/java/com/chinaitop/depot/monitor/controller/MonitorController.java

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.monitor.controller;
+
+
+import com.chinaitop.depot.monitor.service.MonitorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping(value = "/MonitorInfo")
+@Api(tags = "摄像头")
+public class MonitorController {
+
+    @Resource
+    private MonitorService monitorService;
+
+
+
+    @PostMapping(value = "/updateMonitorStatus")
+    @ApiOperation(value = "定时更行", notes = "定时更行摄像头信息")
+    public void updateMonitorStatus(){
+        monitorService.updateMonitorStatus();
+    }
+
+}

src/main/java/com/chinaitop/depot/monitor/controller/PreviewPlaybackController.java

@@ -0,0 +1,73 @@
+package com.chinaitop.depot.monitor.controller;
+
+import com.chinaitop.depot.hk.dto.req.PlaybackReqDTO;
+import com.chinaitop.depot.hk.dto.req.PreviewReqDTO;
+import com.chinaitop.depot.hk.dto.res.PlaybackResDTO;
+import com.chinaitop.depot.hk.dto.res.PreviewResDTO;
+import com.chinaitop.depot.hk.service.HkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 视频预览回放
+ */
+@RestController
+@RequestMapping(value = "/previewPlayback")
+@Api(description = "预览回放")
+public class PreviewPlaybackController {
+
+    @Resource
+    private HkService hkService;
+
+    
+    /**
+     * 摄像头预览
+     * @param previewReqDTO
+     * @return
+     */
+    @RequestMapping(value="/getPreview", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="预览", notes = "预览")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "{cameraIndexCode}", value = "监控点编号", paramType = "query")
+    })
+    public PreviewResDTO getAlarmPhone(PreviewReqDTO previewReqDTO) {
+        return hkService.previewURLs(previewReqDTO);
+    }
+    
+    
+    /**
+     * 摄像头回放
+     * @param playbackReqDTO
+     * @return
+     */
+    @RequestMapping(value="/getPlayback", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="回放", notes = "回放")
+    /*@ApiImplicitParams({
+            @ApiImplicitParam(name = "cameraIndexCode", value = "监控点唯一标识，分页获取监控点资源接口获取返回参数", paramType = "query"),
+            @ApiImplicitParam(name = "recordLocation", value = "存储类型, 0：中心存储, 1：设备存储 (默认为中心存储)", paramType = "query"),
+            @ApiImplicitParam(name = "protocol", value = "取流协议", paramType = "query"),
+            @ApiImplicitParam(name = "transmode", value = "传输协议，默认为TCP", paramType = "query"),
+            @ApiImplicitParam(name = "beginTime", value = "开始时间，ISO8601格式", paramType = "query"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间，与开始时间相差不超过三天，ISO8601格式", paramType = "query"),
+            @ApiImplicitParam(name = "uuid", value = "分页查询id，用于继续查询剩余片段，默认为空字符串 (设备存储生效)", paramType = "query"),
+            @ApiImplicitParam(name = "uuid", value = "分页查询id，用于继续查询剩余片段，默认为空字符串 (设备存储生效)", paramType = "query"),
+            @ApiImplicitParam(name = "expand", value = "扩展内容，支持指定解码格式等，格式：key=value，多个以&隔开", paramType = "query"),
+            @ApiImplicitParam(name = "streamform", value = "输出码流转封装格式，默认为RTP ,ps", paramType = "query"),
+            @ApiImplicitParam(name = "lockType", value = "查询录像的锁定类型，默认查询全部录像 0  1未锁定 2锁定", paramType = "query")
+
+    })*/
+    public PlaybackResDTO getPlayback(PlaybackReqDTO playbackReqDTO) {
+        return hkService.playbackURLs(playbackReqDTO);
+    }
+
+    
+}

src/main/java/com/chinaitop/depot/monitor/service/MonitorService.java

@@ -2,5 +2,5 @@ package com.chinaitop.depot.monitor.service;
 
 public interface MonitorService {
 
-   void UpdateMonitorStatus();
+   void updateMonitorStatus();
 }

src/main/java/com/chinaitop/depot/monitor/service/impl/MonitorServiceImpl.java

@@ -5,16 +5,14 @@ import com.chinaitop.depot.basic.model.MonitorCameraExample;
 import com.chinaitop.depot.basic.service.MonitorCameraService;
 import com.chinaitop.depot.hk.dto.req.CameraReqDTO;
 import com.chinaitop.depot.hk.dto.res.CameraResDTO;
-import com.chinaitop.depot.hk.dto.res.ResultResDTO;
 import com.chinaitop.depot.hk.service.HkService;
 import com.chinaitop.depot.monitor.service.MonitorService;
-import com.chinaitop.depot.utils.ParameterUtil;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -28,22 +26,28 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Transactional
     @Override
-    public void UpdateMonitorStatus() {
+    public void updateMonitorStatus() {
         //查询所有摄像头
         MonitorCameraExample example = new MonitorCameraExample();
         MonitorCameraExample.Criteria criteria = example.createCriteria();
         criteria.andIsremoveEqualTo("1");//默认加载未删除的数据
         List<MonitorCamera> list = cameraService.queryByExample(example);
         Integer status;
+
         if (!list.isEmpty()) {
             for (MonitorCamera camera : list) {
                 if(camera.getCameraIndexCode()!=null){
                     MonitorCamera monitorCamera =new MonitorCamera();
                     CameraResDTO resDTO= hkService.getCamera(new CameraReqDTO(camera.getCameraIndexCode()));
                     if(resDTO.getStatus()!=null){
+                        if("0".equals(resDTO.getStatus())){
+                            status=0;
+                            monitorCamera.setWarnTime(new Date());
+                        }
                         status=Integer.parseInt(resDTO.getStatus());
                     }else{
                         status=0;
+
                     }
                     monitorCamera.setId(camera.getId());
                     monitorCamera.setStatus(status) ;

src/main/java/com/chinaitop/depot/monitor/timer/MonitorRunner.java

@@ -1,15 +0,0 @@
-package com.chinaitop.depot.monitor.timer;
-
-import com.chinaitop.depot.monitor.service.MonitorService;
-
-import javax.annotation.Resource;
-
-public class MonitorRunner implements Runnable{
-
-    @Resource
-   private MonitorService monitorService;
-    @Override
-    public void run() {
-        monitorService.UpdateMonitorStatus();
-    }
-}