报警推送接口修改

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

@@ -1264,7 +1264,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        return null;
+        return "正常";
     }
 
     public AjaxResult stop(String id) {

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

@@ -14,6 +14,7 @@ import com.ozs.common.utils.HeartbeatUtils;
 import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.IgnoreUtils;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.config.Constant;
 import com.ozs.entity.BaseCameraManagement;
@@ -316,8 +317,8 @@ public class GeoHazardMonitorTokenController {
                     wrapper.orderByAsc(BaseCameraManagement::getInstallMile);
                 }
                 if (reqMsgAlarmVo.getLineDir() == 2) {
-                    wrapper.ge(BaseCameraManagement::getEndMile,reqMsgAlarmVo.getAlarmMile());
-                    wrapper.le(BaseCameraManagement::getBeginMile,reqMsgAlarmVo.getAlarmMile());
+                    wrapper.ge(BaseCameraManagement::getEndMile, reqMsgAlarmVo.getAlarmMile());
+                    wrapper.le(BaseCameraManagement::getBeginMile, reqMsgAlarmVo.getAlarmMile());
                     wrapper.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
                     wrapper.orderByDesc(BaseCameraManagement::getInstallMile);
                 }
@@ -392,34 +393,30 @@ public class GeoHazardMonitorTokenController {
                     }
                     List<SysDictData> frontValue = dictTypeService.selectDictDataByType("alarm_play_time_front_value");
                     List<SysDictData> laterValue = dictTypeService.selectDictDataByType("alarm_play_time_later_value");
-                    String finalCode = code;
-                    CompletableFuture<String> future =CompletableFuture.supplyAsync(() -> {
-                        String urLs = cameraUtil.playbackURLs(finalCode, frontValue.get(0).getDictValue(), laterValue.get(0).getDictValue());
-                        if (urLs.contains("无视频")) {
-                            return urLs;
-                        }
-                        String playback = CameraUtil.startRecording(finalCode, "playback");
-                        if (!"ok".equals(playback)){
-                            return "暂无视频-" + finalCode; 
-                        }
-                        return null;
-                    });
-                    String url = future.get();
-                    if (url.contains("无视频")) {
+                    log.info("--------------------------------------------------------");
+                    String urLs = cameraUtil.playbackURLs(code, frontValue.get(0).getDictValue(), laterValue.get(0).getDictValue());
+                    log.info("---urLs---------"+urLs);
+                    if (urLs.contains("无视频")) {
+                        jsonObject.put("resultCode", 0);
+                        jsonObject.put("message", urLs);
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
+                    }
+                    String start = HttpUtils.sendGet(CameraUtil.startRecording(code, "playback"));
+                    if (!"ok".equals(start)) {
                         jsonObject.put("resultCode", 0);
-                        jsonObject.put("message", url);
+                        jsonObject.put("message", "暂无视频-" + code);
                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-                    }else {
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                        // 使用SimpleDateFormat将Date对象格式化为指定样式的字符串
-                        String formattedDate = sdf.format(msgAlarmVice.getAlarmTime());
-                        log.info("-----formattedDate-----------"+formattedDate);
-                        String records = cameraUtil.getQueryRecords(code + "/playback", formattedDate);
-                        log.info("-----records-----------"+records);
-                        MsgAlarm alarm1 = msgAlarmService.getById(msgAlarm.getId());
-                        alarm1.setReleasedUrl(records);
-                        msgAlarmService.updateById(alarm1);
                     }
+                    //修改报警播放地址
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    // 使用SimpleDateFormat将Date对象格式化为指定样式的字符串
+                    String formattedDate = sdf.format(msgAlarmVice.getAlarmTime());
+                    log.info("-----formattedDate-----------" + formattedDate);
+                    String records = cameraUtil.getQueryRecords(code + "/playback", formattedDate);
+                    log.info("-----records-----------" + records);
+                    MsgAlarm alarm1 = msgAlarmService.getById(msgAlarm.getId());
+                    alarm1.setReleasedUrl(records);
+                    msgAlarmService.updateById(alarm1);
                 }
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
@@ -1185,7 +1182,7 @@ public class GeoHazardMonitorTokenController {
                 log.info("---------jsonObject---开始-------" + jsonObject);
                 long end = System.currentTimeMillis();
                 log.info("接受心跳时间: " + sdf.format(new Date(end)));
-                log.info("心跳接口请求用时时间:" + (begin - end) / 1000+"秒");
+                log.info("心跳接口请求用时时间:" + (begin - end) / 1000 + "秒");
                 log.info("---------jsonObject---结果-------" + jsonObject);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             } else {
@@ -1633,7 +1630,7 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             } else {
-                if(StringUtils.isEmpty(one.getReleasedUrl())){
+                if (StringUtils.isEmpty(one.getReleasedUrl())) {
                     jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "该报警还未生成报警回放视频");
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);