查询回放视频根据报警ID接口修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -868,19 +868,20 @@ public class BaseCameraManagementController extends BaseController {
                             (Date) map.get("releasedTime"),
                             true);
                     msgAlarm.setReleasedUrl(url);
+                    msgAlarmService.updateById(msgAlarm);
                 } else {
                     url = com.ozs.web.core.util.CameraUtil.historyPlayListStr(map.get("channel").toString(),
                             (Date) map.get("alarmTime"),
                             new Date(),
                             false);
                 }
-                return new AjaxResult(200, "ok", serverConfig.getUrl() + url);
+                return new AjaxResult(200, "ok",serverConfig.getUrl()+url);
             } else {
                 return error("报警ID为:【" + alarmId + "】的相机信息不存在");
             }
 
         } else {
-            return new AjaxResult(200, "ok", msgAlarm.getReleasedUrl());
+            return new AjaxResult(200, "ok", serverConfig.getUrl()+msgAlarm.getReleasedUrl());
         }
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -22,6 +22,7 @@ import com.ozs.service.service.*;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
+import com.ozs.web.core.util.CameraUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -405,6 +406,17 @@ public class MsgAlarmController extends BaseController {
         LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
         boolean update1 = msgWebPushService.update(queryWrapper);
+        
+        //添加报警视频url
+        LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
+        base.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(base);
+        String url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
+                msgAlarm.getAlarmTime(),
+                msgAlarm.getReleasedTime(),
+                false);
+        msgAlarm.setReleasedUrl(url);
+        msgAlarmService.updateById(msgAlarm);
         if (b && update && update1) {
             return AjaxResult.success();
         } else {