Browse Source

相机导入添加工务段判断

hexiao 2 years ago
parent
commit
bd0a8e24dd

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

@@ -94,6 +94,7 @@ public class BaseCameraManagementController extends BaseController {
     @Autowired
     private IdempotenceUtils idempotenceUtils;
 
+
     /**
      * 所有相机列表+权限
      */
@@ -170,6 +171,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         List<String> userIds = baseCameraManagementService.getUserIdList(getUserId());
+
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(userIds)) {
             lw.in(BaseCameraManagement::getCreateBy, userIds);

+ 3 - 2
hazard-admin/src/main/resources/application.yml

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