回放修改2.4

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/constant/Constant.java

@@ -240,6 +240,10 @@ public class Constant {
     //videoRecord
     public static final String CHANNEL_URL_VIDEO_RECORD = "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime";
 
+
+    //videoRecord
+    public static final String CHANNEL_URL_VIDEO_QUERY = "/evo-apigw/admin/API/SS/Record/QueryRecords";
+
     //获取事件url
     public static final String CHANNEL_URL_ALARM_RECORD = "/evo-apigw/evo-event/1.2.0/alarm-record/page";
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/VideoRecorControllerSg.java

@@ -3,11 +3,13 @@ package com.huimv.video.dhicc.test.controller;
 //拿视频回放
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.dahuatech.icc.exception.ClientException;
 import com.huimv.video.dhicc.result.R;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.request.Video.VideoRecordQueryRequestSg;
 import com.huimv.video.dhicc.test.request.Video.VideoRecordRequestCn;
 import com.huimv.video.dhicc.test.request.Video.VideoRecordRequestHn;
 import com.huimv.video.dhicc.test.request.Video.VideoRecordRequestSg;
@@ -43,13 +45,7 @@ public class VideoRecorControllerSg {
         String channelId = (String) params1.get("nodeCode");
         Integer farmId = (Integer) params1.get("farmId");
 
-        Map<String, Object> value = new HashMap<>();
-        value.put("nvrId", "");
-        value.put("optional", "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime");
-        value.put("recordType", "1");
-        value.put("streamType", "1");
-        value.put("recordSource", "2");
-        value.put("channelId", channelId);
+
 
         //开始结束时间代为处理
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -59,17 +55,35 @@ public class VideoRecorControllerSg {
         Date GapAfter = new Date(Time.getTime() + 1000 * 60 * 5);// end   事件五分钟之后
         String befor = String.valueOf(GapTimeBefor_gap.getTime() / 1000);
         String after = String.valueOf(GapAfter.getTime() / 1000);
-        value.put("endTime", after);
-        value.put("startTime", befor);
 
 
+        Map<String, Object> test = new HashMap<>();
+        test.put("channelId", channelId);
+        test.put("recordSource", "2");
+        test.put("startTime", befor);
+        test.put("endTime", after);
+        test.put("streamType", "0");
+        test.put("recordType", "0");
+        VideoRecordQueryRequestSg queryRequestSg = new VideoRecordQueryRequestSg(oauthConfigBaseInfo);
+        queryRequestSg.setData(test);
+        System.out.println(queryRequestSg);
+        com.alibaba.fastjson.JSONObject jsonObject2 = queryRequestSg.doAction();
+        System.out.println(jsonObject2);
+        JSONArray jsonArray = JSONArray.parseArray(jsonObject2.get("records").toString());
+        System.out.println(jsonArray);
+        com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) jsonArray.get(0);
+        System.out.println(json);
+
+        Map<String, Object> value = new HashMap<>();
+        value.put("recordType", json.get("recordType"));
+        value.put("streamType", json.get("streamType"));
+        value.put("recordSource",json.get("recordSource"));
+        value.put("channelId", channelId);
+        value.put("endTime", json.get("startTime"));
+        value.put("startTime", json.get("endTime"));
         if (farmId == 1) {
             System.out.println("曙光");
             VideoRecordRequestSg requestSg = new VideoRecordRequestSg(oauthConfigBaseInfo);
-            requestSg.setClientMac("30:9c:23:79:40:08");
-            requestSg.setClientPushId("");
-            requestSg.setProject("PSDK");
-            requestSg.setMethod("SS.Playback.StartPlaybackByTime");
             requestSg.setData(value);
             Object jsonObject1 = requestSg.doAction();
             System.out.println(jsonObject1);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Video/VideoRecordQueryRequestSg.java

@@ -0,0 +1,59 @@
+package com.huimv.video.dhicc.test.request.Video;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VideoRecordQueryRequestSg extends BaseRequest<JSONObject> {
+
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordQueryRequestSg() {
+    }
+
+    public VideoRecordQueryRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_QUERY, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+     //   System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        JSONObject data = (JSONObject) jsonObject.get("data");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Video/VideoRecordRequestSg.java

@@ -17,13 +17,13 @@ import java.util.Map;
 @Data
 public class VideoRecordRequestSg extends BaseRequest<Object> {
 
-    private String clientMac;
+  /*  private String clientMac;
 
     private String clientPushId;
 
     private String project;
 
-    private String method;
+    private String method;*/
 
     private Map<String,Object> data;
 
@@ -55,10 +55,10 @@ public class VideoRecordRequestSg extends BaseRequest<Object> {
     private void setBody() {
         //设置请求参数
         Map<String, Object> map = new HashMap<>();
-        map.put("clientMac", this.clientMac);
+     /*   map.put("clientMac", this.clientMac);
         map.put("clientPushId", this.clientPushId);
         map.put("project", this.project);
-        map.put("method", this.method);
+        map.put("method", this.method);*/
         map.put("data", this.data);
         this.setBody(JSON.toJSONString(map));