浏览代码

修改解除报警接口操作人取值

wyyay 6 月之前
父节点
当前提交
9630450f89

+ 3 - 1
business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1177,6 +1177,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
          * STEP3:设置接口的URI地址
          */
         final String previewURLsApi = ARTEMIS_PATH + url;
+        log.info("天网url:{}" + previewURLsApi);
         Map<String, String> path = new HashMap<String, String>(2) {
             {
                 put("https://", previewURLsApi);//根据现场环境部署确认是http还是https
@@ -1287,7 +1288,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
          */
         camerasVo.setStreamType(0);
         camerasVo.setProtocol("rtsp");
-        camerasVo.setTransmode(1);
+        camerasVo.setTransmode(0);
         camerasVo.setExpand("streamform=rtp");
         String body = JSONObject.toJSONString(camerasVo);
         String previewURLs = getPreviewURLs("/api/video/v1/cameras/previewURLs", body);
@@ -1295,6 +1296,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             return "天网无视频-" + camerasVo.getCameraIndexCode();
         }
         log.info("-------------------------------->>>>>previewURLs" + previewURLs);
+        log.info("-------------------------------->>>>>天网接口参数:{}" + camerasVo);
         JSONObject outJson = JSONObject.parse(previewURLs);
         if ("0".equals(outJson.getString("code"))) {
             log.info("outJson----->" + outJson);

+ 1 - 1
vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -456,7 +456,7 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "解除原因不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())) {
+            if (ObjectUtils.isEmpty(releaseAlarmVo.getOperator())) {
                 AjaxResults1 = new AjaxResults(0, "解除人不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }