报警推送接口修改

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

@@ -402,23 +402,23 @@ public class GeoHazardMonitorTokenController {
 //                        if (!"ok".equals(playback)){
 //                            return "暂无视频-" + finalCode; 
 //                        }
-                       return "正常";
-                    });
-//                    String url = future.get();
-//                    if (url.contains("无视频")) {
-//                        jsonObject.put("resultCode", 0);
-//                        jsonObject.put("message", url);
-//                        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);
+                        String records = cameraUtil.getQueryRecords(finalCode + "/playback", formattedDate);
                         log.info("-----records-----------"+records);
                         MsgAlarm alarm1 = msgAlarmService.getById(msgAlarm.getId());
                         alarm1.setReleasedUrl(records);
                         msgAlarmService.updateById(alarm1);
+                       return "正常";
+                    });
+//                    String url = future.get();
+//                    if (url.contains("无视频")) {
+//                        jsonObject.put("resultCode", 0);
+//                        jsonObject.put("message", url);
+//                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
+//                    }else {
 //                    }
                 }
             } else {