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

guoshilong

2023-05-09 a6c416b12234d7933e535fc4f08855f24a696a80

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java

@@ -203,6 +203,7 @@
        JSONObject jsonBody = new JSONObject();
        jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
        jsonBody.put("protocol", hk.getProtocol());
        jsonBody.put("recordLocation", "1");
        jsonBody.put("beginTime", hk.getBeginTime());
        jsonBody.put("endTime", hk.getEndTime());
        String body = jsonBody.toJSONString();

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java

@@ -2,11 +2,13 @@

import cn.gistack.sm.hk.constant.HkConstant;
import cn.gistack.sm.hk.constant.ProtocolConstant;
import cn.gistack.sm.hk.vo.HkVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.springblade.core.tool.api.R;

import java.util.ArrayList;
import java.util.HashMap;
@@ -274,13 +276,13 @@

//    public static void main(String[] args) {
//
//        String result = GetCameraResourcePage(1, 10, HkConstant.cameras);
//
//        JSONObject jsonObject1 = JSONObject.parseObject(result);
//        JSONObject res1 = (JSONObject) jsonObject1.get("data");
//        JSONArray arr1 = JSON.parseArray(res1.getString("list"));
//        JSONObject data1 = (JSONObject) arr1.get(1);
//        String code1 = data1.get("cameraIndexCode").toString();
////        String result = GetCameraResourcePage(1, 10, HkConstant.cameras);
////
////        JSONObject jsonObject1 = JSONObject.parseObject(result);
////        JSONObject res1 = (JSONObject) jsonObject1.get("data");
////        JSONArray arr1 = JSON.parseArray(res1.getString("list"));
////        JSONObject data1 = (JSONObject) arr1.get(1);
////        String code1 = data1.get("cameraIndexCode").toString();
//
//        // 云台控制
////        String right = controlling(HkConstant.controllingURLs,
@@ -318,10 +320,10 @@
//        //ff1f050afd1c47829dec1ec14575c9e3
//        //e2cb261e14144f53a300769839d54753
//        //根据子节点编号获取设备播放地址
//        String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
//            "0113d3498d2e41caaf9e5355d1575da3", ProtocolConstant.WS);
//        JSONObject jsonObject = JSONObject.parseObject(result3);
//        Map map = (Map) jsonObject.get("data");
////        String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
////            "0113d3498d2e41caaf9e5355d1575da3", ProtocolConstant.WS);
////        JSONObject jsonObject = JSONObject.parseObject(result3);
////        Map map = (Map) jsonObject.get("data");
//        //根据子节点编号获取音频对讲地址
////        String result4 = GetTalkURLs(HkConstant.talkURLs, code1);
//
@@ -329,7 +331,29 @@
////        System.out.println("result1 = " + result1);
////        System.out.println("result2 = " + result2);
////        System.out.println("result3 = " + result3);
//        System.out.println("url = " + map.get("url"));
////        System.out.println("url = " + map.get("url"));
////        System.out.println("result4 = " + result4);
//
//        // 查询回放url
//        HkVO hk = new HkVO();
//        hk.setCameraIndexCode("0c4f30948dde4998a676ec6983119cb5");
//        hk.setBeginTime("2023-05-08T11:52:16.000+08:00");
//        hk.setEndTime("2023-05-11T11:52:15.000+08:00");
//        hk.setProtocol("wss");
//
//        /**
//         * 组装请求参数
//         */
//        JSONObject jsonBody = new JSONObject();
//        jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
//        jsonBody.put("protocol", hk.getProtocol());
//        jsonBody.put("recordLocation", "1");
//        jsonBody.put("beginTime", hk.getBeginTime());
//        jsonBody.put("endTime", hk.getEndTime());
//        String body = jsonBody.toJSONString();
//
//        String common = common(HkConstant.playbackURLs, body);
//
//        System.out.println("common = " + common);
//    }
}