首页-地图

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -136,8 +136,11 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
         for (BaseCameraManagementHomeVo baseCameraManagementHomeVo : allListVo) {
             Map map = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
-            String isLock = map.get("isLock").toString();
-            baseCameraManagementHomeVo.setIsLock(!StringUtils.isEmpty(map.get("isLock")) ? Integer.valueOf(isLock) : 1);
+            String isLock = "1";
+            if (!StringUtils.isEmpty(map) && !StringUtils.isEmpty(map.get("isLock"))) {
+                isLock = map.get("isLock").toString();
+            }
+            baseCameraManagementHomeVo.setIsLock(Integer.valueOf(isLock));
         }
         return allListVo;
     }

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

@@ -145,11 +145,11 @@ 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.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarmResp.setImageUrls(objects);
@@ -248,8 +248,8 @@ public class BaseCameraManagementController extends BaseController {
     @Transactional
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
-        if (StringUtils.isNotEmpty(idempotence)){
-            return  error("你的网络卡顿,请不要一直添加!!!");
+        if (StringUtils.isNotEmpty(idempotence)) {
+            return error("你的网络卡顿,请不要一直添加!!!");
         }
         idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -387,7 +387,7 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<BaseCameraManagement>(BaseCameraManagement.class);
         List<BaseCameraManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport,getUserId());
+        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport, getUserId());
         return AjaxResult.success(message);
     }
 
@@ -505,13 +505,13 @@ public class BaseCameraManagementController extends BaseController {
             children1.sort(new Comparator<CameraTree>() {
                 @Override
                 public int compare(CameraTree o1, CameraTree o2) {
-                  int i=  o1.getMileage() - o2.getMileage();
-                  if (i==0) {
-                      String[] split = o1.getName().split("-");
-                      return  "上行".equals(split[1])?-1:1;
-                  }else {
-                      return i;
-                  }
+                    int i = o1.getMileage() - o2.getMileage();
+                    if (i == 0) {
+                        String[] split = o1.getName().split("-");
+                        return "上行".equals(split[1]) ? -1 : 1;
+                    } else {
+                        return i;
+                    }
                 }
             });
             for (CameraTree tree : children1) {