Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-monitor-qinghai into dev

pom.xml

@@ -222,6 +222,16 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>

src/main/java/com/chinaitop/depot/hk/constant/ApiHkConstant.java

@@ -49,6 +49,13 @@ public interface ApiHkConstant {
      * @date: 2024/6/20
      **/
     String API_HK_RECORD_STOP = "/artemis/api/video/v1/manualRecord/stop";
+    /**
+     * 手动抓图
+     *
+     * @author: ybw
+     * @date: 2024/6/20
+     **/
+    String API_HK_MANUAL_CAPTURE = "/artemis/api/video/v1/manualCapture";
 
 
     /**

src/main/java/com/chinaitop/depot/hk/dto/req/CaptureReqDTO.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.hk.dto.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * 手动抓图
+ *
+ * @author ybw
+ * @version V1.0
+ * @className CaptureReqDTO
+ * @date 2024/6/22
+ **/
+@Data
+@AllArgsConstructor
+public class CaptureReqDTO {
+    /**
+     * 监控点编号
+     *
+     * @author: ybw
+     * @date: 2024/6/19
+     **/
+    private String cameraIndexCode;
+}

src/main/java/com/chinaitop/depot/hk/dto/res/CaptureResDTO.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.hk.dto.res;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * 手动抓图
+ *
+ * @author ybw
+ * @version V1.0
+ * @className CaptureReqDTO
+ * @date 2024/6/22
+ **/
+@Data
+@AllArgsConstructor
+public class CaptureResDTO {
+    /**
+     * 图片 url 信息
+     *
+     * @author: ybw
+     * @date: 2024/6/19
+     **/
+    private String picUrl;
+}

src/main/java/com/chinaitop/depot/hk/service/HkService.java

@@ -83,4 +83,16 @@ public interface HkService {
      * @date: 2024/6/20
      **/
     void recordStop(RecordStopReqDTO recordStopReqDTO);
+
+
+    /**
+     * 手动抓图
+     *
+     * @param captureReqDTO
+     * @methodName: manualCapture
+     * @return: com.ybw.dto.res.CaptureResDTO
+     * @author: ybw
+     * @date: 2024/6/20
+     **/
+    CaptureResDTO manualCapture(CaptureReqDTO captureReqDTO);
 }

src/main/java/com/chinaitop/depot/hk/service/impl/HkServiceImpl.java

@@ -146,7 +146,7 @@ public class HkServiceImpl implements HkService {
                 return resultResDTO.getData();
             }
         } catch (Exception e) {
-            log.error("previewURLs error:", e);
+            log.error("recordStart error:", e);
         }
         return null;
     }
@@ -164,7 +164,28 @@ public class HkServiceImpl implements HkService {
             );
             log.info("{}", JSON.toJSONString(resultResDTO));
         } catch (Exception e) {
-            log.error("previewURLs error:", e);
+            log.error("recordStop error:", e);
         }
     }
+
+    @Override
+    public CaptureResDTO manualCapture(CaptureReqDTO captureReqDTO) {
+        try {
+            // 接口地址
+            Map<String, String> path = getPath(ApiHkConstant.API_HK_MANUAL_CAPTURE);
+            String result = ArtemisHttpUtil.doPostStringArtemis(artemisConfig, path, JSON.toJSONString(captureReqDTO), null, null, "application/json");
+            ResultResDTO<CaptureResDTO> resultResDTO = JSONObject.parseObject(
+                    result,
+                    new TypeReference<ResultResDTO<CaptureResDTO>>() {
+                    }
+            );
+            log.info("{}", JSON.toJSONString(resultResDTO));
+            if (ApiHkConstant.Code.SUCCESS.equals(resultResDTO.getCode())) {
+                return resultResDTO.getData();
+            }
+        } catch (Exception e) {
+            log.error("manualCapture error:", e);
+        }
+        return null;
+    }
 }

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);
+    }
+
+    
+}