菜单权限表修改

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

@@ -225,7 +225,8 @@ public class BaseCameraManagementController extends BaseController {
                     for (String s : roleKey) {
                         if ("admin".equals(s)) {
                             o.setIsStartRecording(1);
-                        }else {
+                            break;
+                        } else {
                             o.setIsStartRecording(2);
                         }
                     }
@@ -433,7 +434,7 @@ public class BaseCameraManagementController extends BaseController {
         LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
-            wrapper1.orderByDesc(  MsgAlarm::getAlarmTime);
+            wrapper1.orderByDesc(MsgAlarm::getAlarmTime);
         }
         List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
         List<Object> list = new ArrayList<>();
@@ -442,7 +443,7 @@ public class BaseCameraManagementController extends BaseController {
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
-        if (list1.size()<=0) {
+        if (list1.size() <= 0) {
             list.add(1);
         } else {
             MsgAlarm msgAlarm = list1.get(0);
@@ -743,7 +744,7 @@ public class BaseCameraManagementController extends BaseController {
                 wrapper1.orderByDesc(MsgAlarm::getCreateTime);
             }
             List<MsgAlarm> list = msgAlarmService.list(wrapper1);
-            if (list.size()>0) {
+            if (list.size() > 0) {
                 MsgAlarm msgAlarm = list.get(0);
                 msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
                 msgAlarmResp.setIsLock(msgAlarm.getIsLock());
@@ -752,7 +753,7 @@ public class BaseCameraManagementController extends BaseController {
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                     String[] split = msgAlarm.getImageUrl().split(";");
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-                    log.info("publish--------"+objects);
+                    log.info("publish--------" + objects);
                     msgAlarmResp.setImageUrls(objects);
                 }
             }
@@ -761,14 +762,14 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = "["+begin+"]-[" + end+"]";
+            String endMile = "[" + begin + "]-[" + end + "]";
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
             return AjaxResult.success(msgAlarmResp);
-        }else {
+        } else {
             return error("该相机编码在相机台账表中不存在");
         }
     }