Home Explore Help
Sign In
ytrd-project-management
/
GeoHazardMonitor
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

代码修改

gao.qiang 1 year ago
parent
0966756fdb
commit
8379ddc8a8
2 changed files with 12 additions and 8 deletions
Split View Show Diff Stats
  1. 11 7
      hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java
  2. 1 1
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 11 - 7
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java
View File 

@@ -376,7 +376,7 @@ public class MsgAlarmController extends BaseController {
 
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
 
             msgAlarmResp.setDeptName(sysDept.getDeptName());
 
             String[] split1 = msgAlarm.getAlarmAttr().split(",");
 
-            String stringBuilder = "画面大小为" + split1[0] + "×" + split1[1] + "," +
 
+            String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
 
                     "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
 
                     "大小" + split1[4] + "×" + split1[5];
 
             msgAlarmResp.setAlarmAttrName(stringBuilder);
 
@@ -408,12 +408,16 @@ public class MsgAlarmController extends BaseController {
 
         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);
 
+        String url = null;
 
+        try {
 
+            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
 
+                    msgAlarm.getAlarmTime(),
 
+                    msgAlarm.getReleasedTime(),
 
+                    false);
 
+        } catch (Exception exception) {
 
+            log.error(exception.getMessage());
 
+        }
 
+        msgAlarm.setReleasedUrl(url);
 
         boolean b = msgAlarmService.updateById(msgAlarm);
 
 //        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
 
 //        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
View File 

@@ -214,7 +214,7 @@ public class CameraUtil {
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
 
         String s = HttpUtils.sendGet(webUrl + "/api/record/flv/list", param);
 
         // 视频拼接
 
-        if (!StringUtils.isBlank(s) || "null".equals(s)) {
 
+        if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
 
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
 
             if (ObjectUtils.isEmpty(maps)) {
 
                 return null;