升级设备修改

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

@@ -337,7 +337,10 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
-            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+//            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            wrapper.and((wp) -> {
+                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            });
         }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
         return baseCameraManagements;

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

@@ -397,18 +397,6 @@ public class BaseCameraManagementController extends BaseController {
                 return error("监控范围开始里程位置不能大于监控范围结束里程位置");
             }
         }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())){
-            baseCameraManagement.setInstallLatitude(null);
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude())){
-            baseCameraManagement.setInstallLongitude(null);
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getMeasurePointName())){
-            baseCameraManagement.setMeasurePointName(null);
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraSn())){
-            baseCameraManagement.setCameraSn(null);
-        }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());
         baseCameraManagement.setCreateBy(management.getCreateBy());
@@ -897,7 +885,9 @@ public class BaseCameraManagementController extends BaseController {
             }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
-            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude())&&!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())) {
+                msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+            }
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());