bug修改

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

@@ -15,6 +15,7 @@ import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.CameraLogDetailService;
 import com.ozs.service.utils.PublishClient;
 import com.ozs.service.utils.SubscribeClient;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
  * @create 2023/4/24 11:22
  */
 @Service
+@Slf4j
 public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionMapper, BaseCameraVersion> implements BaseCameraVersionService {
 
     @Autowired
@@ -155,11 +157,13 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode,value);
             BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
             if (one.getIsDisable()==2){
+                log.info("cameraVersionUpgrade--------相机已下线");
                 cameraLogDetailService.updateAccessories(one.getCameraCode(),400,"相机已下线");
                 it.remove();
             }
         }
         if ("3".equals(baseCameraVersionVo.getUpgradeType())){
+            log.info("cameraVersionUpgrade--------3");
             List<BaseVersionCameraParam> baseVersionCameraParamList = baseCameraVersionVo.getBaseVersionCameraParamList();
             for (BaseVersionCameraParam baseVersionCameraParam : baseVersionCameraParamList) {
                 if ("threshold".equals(baseVersionCameraParam.getParamKey())) {

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -13,6 +13,7 @@ import com.ozs.service.entity.vo.Param;
 import com.ozs.service.entity.vo.Svp;
 import com.ozs.service.entity.vo.UpdateDeviceSn;
 import com.ozs.service.entity.vo.Venc0;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttDeliveryToken;
@@ -34,6 +35,7 @@ import java.util.UUID;
  *
  * @author Administrator
  */
+@Slf4j
 public class PublishClient {
     /**
      * mqtt服务器地址
@@ -161,6 +163,7 @@ public class PublishClient {
         /**
          * 发布客户端
          */
+        log.info("updateDeviceSn---start");
         for (String code : baseCameraVersionVo.getCameraCodeList()) {
             try {
                 PublishClient server = new PublishClient("update_" + code, "update_" + code);
@@ -188,8 +191,9 @@ public class PublishClient {
                  * 发布
                  */
                 server.publish(server.topic11, server.message);
+                log.info("updateDeviceSn---end");
             } catch (MqttException e) {
-                System.out.println(e.getMessage());
+                System.out.println("updateDeviceSn-------"+e.getMessage());
             }
         }
     }

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());
@@ -445,8 +433,6 @@ public class BaseCameraManagementController extends BaseController {
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
 
         Double install = (double) baseCameraManagement.getInstallMile() / 1000;
-        Double end = (double) baseCameraManagement.getEndMile() / 1000;
-        Double begin = (double) baseCameraManagement.getBeginMile() / 1000;
         String[] split = install.toString().split("\\.");
         int number = Integer.parseInt(split[1]);
         if (number == 0) {
@@ -454,19 +440,25 @@ public class BaseCameraManagementController extends BaseController {
         } else {
             baseCameraManagement.setInstallMiles(install.toString());
         }
-        String[] ends = end.toString().split("\\.");
-        int numbers = Integer.parseInt(ends[1]);
-        if (numbers == 0) {
-            baseCameraManagement.setEndMiles(ends[0]);
-        } else {
-            baseCameraManagement.setEndMiles(end.toString());
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
+            Double end = (double) baseCameraManagement.getEndMile() / 1000;
+            String[] ends = end.toString().split("\\.");
+            int numbers = Integer.parseInt(ends[1]);
+            if (numbers == 0) {
+                baseCameraManagement.setEndMiles(ends[0]);
+            } else {
+                baseCameraManagement.setEndMiles(end.toString());
+            }
         }
-        String[] begins = begin.toString().split("\\.");
-        int numberss = Integer.parseInt(begins[1]);
-        if (numberss == 0) {
-            baseCameraManagement.setBeginMiles(begins[0]);
-        } else {
-            baseCameraManagement.setBeginMiles(begin.toString());
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            Double begin = (double) baseCameraManagement.getBeginMile() / 1000;
+            String[] begins = begin.toString().split("\\.");
+            int numberss = Integer.parseInt(begins[1]);
+            if (numberss == 0) {
+                baseCameraManagement.setBeginMiles(begins[0]);
+            } else {
+                baseCameraManagement.setBeginMiles(begin.toString());
+            }
         }
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstalls(mils);
@@ -897,7 +889,11 @@ 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());
+            }else {
+                msgAlarmResp.setInstallLongitude(null);
+            }
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());