Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -847,18 +847,19 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getRecordByAlarmId(@RequestParam("alarmId") String alarmId) {
         Object cacheObject = redisCache.getCacheObject("STREAMING_ALARM_VIDEO:" + alarmId);
-        Map<String, Object> map = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
-        log.info("待合成视频的报警信息集合：{}", map);
-        if (ObjectUtils.isEmpty(map)) {
-            return error("报警UUID:" + alarmId + ",是属于旧数据。请用新数据测试");
-        }
-        if (!map.keySet().contains(alarmId)) {
-            return error("报警UUID:" + alarmId + ",是属于旧数据。请用新数据测试");
-        }
         if (ObjectUtils.isEmpty(cacheObject)) {
+            Map<String, Object> map = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
+            log.info("待合成视频的报警信息集合：{}", map);
+            if (ObjectUtils.isEmpty(map)) {
+                return error("报警UUID:" + alarmId + ",是属于旧数据。请用新数据测试");
+            }
+            if (!map.keySet().contains(alarmId)) {
+                return error("报警UUID:" + alarmId + ",是属于旧数据。请用新数据测试");
+            }
             return error("报警UUID:" + alarmId + ",没有视频录像");
+        } else {
+            return new AjaxResult(200, "ok", serverConfig.getUrl() + cacheObject);
         }
-        return new AjaxResult(200, "ok", serverConfig.getUrl() + cacheObject);
     }
 
 }

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -172,7 +172,7 @@ public class CameraUtil {
     public static String historyPlayListStr(String channel, Date startTm, Date endTm) {
         List<String> list = filterPlayList(channel, startTm, endTm, filePath);
         String uuid = UUID.randomUUID().toString();
-        String ph = "flv/" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())
+        String ph = "record/flv/" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())
                 + "/" + channel + "/"
                 + uuid + ".flv";
         if (!ObjectUtils.isEmpty(list)) {