添加相机开启录像判断

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

@@ -201,6 +201,7 @@ public class BaseCameraManagementController extends BaseController {
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
         List<String> roleKey = baseUserService.getRoleName(getUserId());
+        BaseUser baseUser = baseUserService.getUser(getUserId());
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -217,9 +218,10 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
-                if (roleKey.size() > 0) {
+                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
+                    o.setIsStartRecording(1);
                     for (String s : roleKey) {
-                        if ("admin".equals(s)) {
+                        if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
                             o.setIsStartRecording(1);
                             break;
                         } else {
@@ -608,9 +610,9 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 视频服务树形结构
      *
-     * @param 
-     * @param  
-     * @param 
+     * @param
+     * @param
+     * @param
      * @return
      */
     @ApiOperation("视频服务树形结构")
@@ -618,16 +620,16 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo baseCameraResVo) {
         String railwayCode = null;
-        int count=0;
+        int count = 0;
         if (!StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
             railwayCode = baseCameraResVo.getRailwayCode();
         }
         Integer lineDir = null;
-        if ( !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+        if (!StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
             lineDir = baseCameraResVo.getLineDir();
         }
         Integer milsInt = null;
-        if ( StringUtils.isNotEmpty(baseCameraResVo.getMils())) {
+        if (StringUtils.isNotEmpty(baseCameraResVo.getMils())) {
             if (!baseCameraResVo.getMils().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
             }
@@ -667,12 +669,12 @@ public class BaseCameraManagementController extends BaseController {
                     String code = children2.get(0).getCode();
                     tree.setCode(code);
                     children2.remove(0);
-                }else {
+                } else {
                     for (CameraTree cameraTree1 : children2) {
-                         count=count+1;
-                         cameraTree1.setName("相机"+count);
+                        count = count + 1;
+                        cameraTree1.setName("相机" + count);
                     }
-                    count=0;
+                    count = 0;
                 }
             }
         }