第三方接口修改

business-service/src/main/java/com/ozs/entity/MsgAlarm.java

@@ -223,4 +223,6 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     @Excel(name = "报警是否解除")
     @TableField(exist = false)
     private String  isReleaseName;
+
+    private String releasedUrl;
 }

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

@@ -1073,47 +1073,46 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "没有该报警唯一UUID的报警数据");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             } else {
-                //获取报警里程所监控的所有相机
-                LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
-                camera.ge(BaseCameraManagement::getBeginMile, one.getAlarmMile());
-                camera.le(BaseCameraManagement::getEndMile, one.getAlarmMile());
-                camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
-                camera.orderByAsc(BaseCameraManagement::getInstallMile);
-                List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
-                if (baseCameraManagementList.size() > 0) {
-                    BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
-                    Object cacheObject = redisCache.getCacheObject("STREAMING_ALARM_VIDEO:" + baseCameraManagement.getCameraCode());
-                    if (ObjectUtils.isEmpty(cacheObject)) {
+                if (ObjectUtils.isEmpty(one.getReleasedUrl())) {
+                    //获取报警里程所监控的所有相机
+                    LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
+                    camera.ge(BaseCameraManagement::getBeginMile, one.getAlarmMile());
+                    camera.le(BaseCameraManagement::getEndMile, one.getAlarmMile());
+                    camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
+                    camera.orderByAsc(BaseCameraManagement::getInstallMile);
+                    List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
+                    if (baseCameraManagementList.size() > 0) {
+                        BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
+                        long time = one.getAlarmTime().getTime();
+                        long time2 = time - 600000L;
+                        one.setAlarmTime(new Date(time2));
                         String url = null;
                         if ("1".equals(one.getIsRelease().toString())) {
                             url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
                                     one.getAlarmTime(),
                                     one.getReleasedTime(),
                                     true);
-                            redisCache.setCacheObject("STREAMING_ALARM_VIDEO:" + baseCameraManagement.getCameraCode(), url);
-                            redisCache.expire("STREAMING_ALARM_VIDEO:" + baseCameraManagement.getCameraCode(), 365L, TimeUnit.DAYS);
-                        } else {
+                        }else {
                             url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
                                     one.getAlarmTime(),
                                     new Date(),
                                     false);
                         }
-                        urls = serverConfig.getUrl() + url;
+                        one.setReleasedUrl(url);
+                        msgAlarmService.updateById(one);
                     } else {
-                        urls = serverConfig.getUrl() + cacheObject;
+                        jsonObject.put("resultCode", 0);
+                        jsonObject.put("message", "失败");
+                        jsonObject.put("data", "没有该报警里程位置的相机");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                     }
-                } else {
-                    jsonObject.put("resultCode", 0);
-                    jsonObject.put("message", "失败");
-                    jsonObject.put("data", "没有该报警里程位置的相机");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 }
-                map.put("url", urls);
-                jsonObject.put("resultCode", 1);
-                jsonObject.put("message", "ok");
-                jsonObject.put("data", map);
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
+            map.put("url", serverConfig.getUrl() + one.getReleasedUrl());
+            jsonObject.put("resultCode", 1);
+            jsonObject.put("message", "ok");
+            jsonObject.put("data", map);
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
             jsonObject.put("resultCode", 2);
             jsonObject.put("message", "失败");