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

@@ -481,6 +481,19 @@ public class BaseCameraManagementController extends BaseController {
         return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
     }
 
+    @ApiOperation("查询录像")
+    @GetMapping("/api/records/{cameraCode}/{flay}")
+    public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode,
+                                 @PathVariable @NotNull(message = "条件不能为空") boolean flay) {
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+        lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
+        BaseCameraManagement one = baseCameraManagementService.getOne(lw);
+        if (ObjectUtils.isEmpty(one)) {
+            throw new BaseException("相机编号【" + cameraCode + "】不存在");
+        }
+        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel(), flay));
+    }
+
     @ApiOperation("批量查询录像")
     @GetMapping("/api/recordsList")
     public AjaxResult apiRecordsList(@RequestBody
@@ -494,7 +507,12 @@ public class BaseCameraManagementController extends BaseController {
             if (ObjectUtils.isEmpty(one)) {
                 throw new BaseException("相机编号【" + cameraCode + "】不存在");
             }
-            String playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel());
+            String playFlv = null;
+            if (list.size() > 5) {
+                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel(), false);
+            } else {
+                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel());
+            }
             list.add(playFlv);
         }
 

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -79,7 +79,7 @@ public class SysRoleController extends BaseController
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
         LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
-        lw.eq(SysRole::getDelFlag,0);
+        lw.eq(SysRole::getDelFlag, 1);
         if (!StringUtils.isBlank(vo.getRoleName())) {
             lw.like(SysRole::getRoleName, "%" +vo.getRoleName() + "%");
         }

hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -29,5 +29,8 @@ public class CaneraConfig {
     @Value("${base.webUrl:http://47.106.159.135/streams}")
     private String webUrl;
 
+    @Value("${base.bakUrl:http://124.70.58.209:18891}")
+    private String bakUrl;
+
 
 }

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

@@ -33,6 +33,7 @@ public class CameraUtil {
     private static String ffmpegPath;
     private static String filePath;
     private static String webUrl;
+    private static String bakUrl;
 
     @Autowired
     private CaneraConfig caneraConfig;
@@ -72,10 +73,17 @@ public class CameraUtil {
      * @param channel    相机通道
      * @return
      */
-    public static String getPlayFlv(String cameraCode, String channel) {
+    public static String getPlayFlv(String cameraCode, String channel, boolean flay) {
+        if (!flay) {
+            return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+        }
         return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
     }
 
+    public static String getPlayFlv(String cameraCode, String channel) {
+        return getPlayFlv(cameraCode, channel, true);
+    }
+
     /**
      * 开启录制功能
      *
@@ -313,6 +321,7 @@ public class CameraUtil {
         ffmpegPath = caneraConfig.getFfmpegPath();
         filePath = caneraConfig.getFilePath();
         webUrl = caneraConfig.getWebUrl();
+        bakUrl = caneraConfig.getBakUrl();
     }
 
     /**

hazard-admin/src/main/resources/application.yml

@@ -18,9 +18,10 @@ base:
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/
-  historyUrl: http://124.70.58.209:9080
+  historyUrl: http://124.70.58.209:18891
   #  webUrl: http://124.70.58.209:18819
-  webUrl: http://124.70.58.209:9080
+  webUrl: http://124.70.58.209:18819
+  bakUrl: http://124.70.58.209:18891
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.71.171.71:18801/picbucket