Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -45,6 +46,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 测点名称
      */
     @Excel(name = "测点名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String measurePointName;
 
     /**
@@ -85,12 +87,14 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监视相机经度
      */
     @Excel(name = "监视相机经度")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String installLongitude;
 
     /**
      * 监视相机纬度
      */
     @Excel(name = "监视相机纬度")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String installLatitude;
     
     /**
@@ -124,11 +128,13 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 监控范围开始里程位置
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer beginMile;
 
     /**
      * 监控范围结束里程位置
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer endMile;
 
     /**
@@ -197,6 +203,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 相机序列号
      */
     @Excel(name = "序列号")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String cameraSn;
     
     @Excel(name = "备注")

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;

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());
             }
         }
     }

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -25,7 +25,9 @@
         a.version_num AS versionNum,
         a.version_name AS versionName,
         a.last_version_num AS lastVersionNum,
-        a.remark AS remark
+        a.remark AS remark,
+        a.measure_point_name AS measurePointName,
+        a.camera_sn AS cameraSn
         FROM
         base_camera_management a
         <where>

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

@@ -2,6 +2,7 @@ package com.ozs.web.controller.accountmanagment;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
@@ -155,7 +156,7 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = begin + "-" + end;
@@ -207,7 +208,9 @@ public class BaseCameraManagementController extends BaseController {
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
                 o.setDeptName(sysDept.getDeptName());
-                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                    o.setRailwayName(baseRailwayManagement.getRailwayName());
+                }
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
                 if (!ObjectUtils.isEmpty(o.getEndMile())) {
@@ -292,11 +295,13 @@ public class BaseCameraManagementController extends BaseController {
             if (!ObjectUtils.isEmpty(one)) {
                 return error("设备动态管理表该相机编码已存在,不能重复添加");
             }
-            if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
-                return error("监控范围开始里程位置填写格式不正确");
-            } else {
-                double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
-                baseCameraManagement.setBeginMile((int) (begin * 1000));
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+                if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+                    return error("监控范围开始里程位置填写格式不正确");
+                } else {
+                    double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+                    baseCameraManagement.setBeginMile((int) (begin * 1000));
+                }
             }
             if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
                 return error("监控相机安装里程位置填写格式不正确");
@@ -304,14 +309,18 @@ public class BaseCameraManagementController extends BaseController {
                 double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
                 baseCameraManagement.setInstallMile((int) (install * 1000));
             }
-            if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
-                return error("监控范围结束里程位置填写格式不正确");
-            } else {
-                double end = Double.parseDouble(baseCameraManagement.getEndMiles());
-                baseCameraManagement.setEndMile((int) (end * 1000));
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())) {
+                if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+                    return error("监控范围结束里程位置填写格式不正确");
+                } else {
+                    double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+                    baseCameraManagement.setEndMile((int) (end * 1000));
+                }
             }
-            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+                if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+                    return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+                }
             }
             baseCameraManagement.setCreateBy(getUserId());
             baseCameraManagement.setUpdateBy(getUserId());
@@ -357,11 +366,15 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
-            return error("监控范围开始里程位置填写格式不正确");
-        } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
-            baseCameraManagement.setBeginMile((int) (begin * 1000));
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+            if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+                baseCameraManagement.setBeginMile((int) (begin * 1000));
+            }
+        }else {
+            baseCameraManagement.setBeginMile(null);
         }
         if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
@@ -369,14 +382,20 @@ public class BaseCameraManagementController extends BaseController {
             double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
             baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
-            return error("监控范围结束里程位置填写格式不正确");
-        } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
-            baseCameraManagement.setEndMile((int) (end * 1000));
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())) {
+            if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+                baseCameraManagement.setEndMile((int) (end * 1000));
+            }
+        }else {
+            baseCameraManagement.setEndMile(null);
         }
-        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+            }
         }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());
@@ -391,7 +410,9 @@ public class BaseCameraManagementController extends BaseController {
             return error("设备动态管理表没有该相机编码");
         }
         one.setCameraCode(baseCameraManagement.getCameraCode());
-        if (baseCameraManagementService.updateById(baseCameraManagement) && baseDeviceDynamicManagementService.updateById(one)) {
+        LambdaUpdateWrapper<BaseCameraManagement> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(BaseCameraManagement::getId,baseCameraManagement.getId());
+        if (baseCameraManagementService.update(baseCameraManagement,wrapper) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -412,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) {
@@ -421,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);
@@ -864,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());