Merge branch 'dev' of depot-qinghai/depot-monitor-qinghai into master

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

@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024/6/22
  **/
 @Data
-@AllArgsConstructor
+//@AllArgsConstructor
 public class CaptureReqDTO {
     /**
      * 监控点编号

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

@@ -1,6 +1,6 @@
 package com.chinaitop.depot.hk.dto.req;
 
-import lombok.AllArgsConstructor;
+
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024/6/20
  **/
 @Data
-@AllArgsConstructor
+//@AllArgsConstructor
 public class RecordStartReqDTO {
 
     /**
@@ -29,5 +29,7 @@ public class RecordStartReqDTO {
      * 存储类型，0-中心存储，1-设备存储，默认为0-中心存储，如果不指定则默认采用中心存储方式
      */
     private Integer type;
+
+    
 }
 

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

@@ -15,25 +15,31 @@ import com.chinaitop.depot.monitor.model.CameraCapture;
 import com.chinaitop.depot.monitor.model.CameraRecord;
 import com.chinaitop.depot.monitor.service.CameraCaptureService;
 import com.chinaitop.depot.monitor.service.CameraRecordService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+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 org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+
 import javax.annotation.Resource;
 
 /**
  * 视频预览回放
+ * 
+ * 预览---开始手动录像---停止手动录像----回放--手动抓图--云台控制
  */
 @RestController
 @RequestMapping(value = "/previewPlayback")
@@ -62,9 +68,6 @@ public class PreviewPlaybackController {
      */
     @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);
     }
@@ -75,23 +78,9 @@ public class PreviewPlaybackController {
      * @param playbackReqDTO
      * @return
      */
-    @RequestMapping(value="/getPlayback", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/getPlayback", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @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) {
+    public PlaybackResDTO getPlayback(@RequestBody PlaybackReqDTO playbackReqDTO) {
         return hkService.playbackURLs(playbackReqDTO);
     }
 
@@ -100,10 +89,23 @@ public class PreviewPlaybackController {
      * 开始手动录像
      * @param recordStartReqDTO
      * @return
+     * @throws IOException 
+     * @throws JsonMappingException 
+     * @throws JsonParseException 
      */
-    @RequestMapping(value="/recordStart", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/recordStart", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="开始手动录像", notes = "开始手动录像")
-    public RecordStartResDTO recordStart(RecordStartReqDTO recordStartReqDTO,CameraRecord cameraRecord) {
+    public RecordStartResDTO recordStart(String recordStartReqDTOJson, String cameraRecordJson) throws Exception {
+    	
+        
+        // JSON字符串转对象
+        ObjectMapper mapper1 = new ObjectMapper();
+        CameraRecord cameraRecord = (CameraRecord)mapper1.readValue(cameraRecordJson, CameraRecord.class);
+        
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        RecordStartReqDTO recordStartReqDTO = (RecordStartReqDTO)mapper.readValue(recordStartReqDTOJson, RecordStartReqDTO.class);
+        
     	
     	RecordStartResDTO recordStartResDTO = hkService.recordStart(recordStartReqDTO);
     	
@@ -127,12 +129,26 @@ public class PreviewPlaybackController {
     /**
      * 手动抓图
      * @param captureReqDTO
+     * @throws IOException 
+     * @throws JsonMappingException 
+     * @throws JsonParseException 
      */
-    @RequestMapping(value="/manualCapture", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/manualCapture", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="手动抓图", notes = "手动抓图")
-    public String manualCapture(CaptureReqDTO captureReqDTO,CameraCapture cameraCapture) {
+    public String manualCapture(String captureReqDTOJson, String cameraCaptureJson) throws Exception {
+    	
+    	
+    	// JSON字符串转对象
+        ObjectMapper mapper1 = new ObjectMapper();
+        CaptureReqDTO captureReqDTO = (CaptureReqDTO)mapper1.readValue(captureReqDTOJson, CaptureReqDTO.class);
+        
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        CameraCapture cameraCapture = (CameraCapture)mapper.readValue(cameraCaptureJson, CameraCapture.class);
+        
     	CaptureResDTO captureResDTO = hkService.manualCapture(captureReqDTO);
          
+    	
          //加到表里
     	CameraCapture cameraCapture1 = cameraCaptureService.save(cameraCapture,captureResDTO.getPicUrl());
          if(cameraCapture1.getId()>0){

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

@@ -25,8 +25,9 @@ public class CameraCaptureServiceImpl implements CameraCaptureService{
 		//cameraCapture.setCameraId(cameraCapture.getCameraId());
 		//cameraCapture.setOrgId(cameraCapture.getOrgId()+"");
 		// 图片地址转 文件流  picUrl
-		String wjl = NetFileUtil.getBase64Content(picUrl);
-		cameraCapture.setCntxwjl(wjl);
+		//String wjl = NetFileUtil.getBase64Content(picUrl);
+		//System.out.println(wjl.length()+"*******************");
+		cameraCapture.setCntxwjl(picUrl);//文件地址
 		//cameraCapture.setStorehouseId(cameraCapture.getStorehouseId());
 		//cameraCapture.setTxwjhzm(txwjhzm);//图像文件后缀名
 		//cameraCapture.setWarehouseId(cameraCapture.getWarehouseId());//