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

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -64,9 +64,9 @@ public class MsgAlarmResp implements Serializable {
     private String installLongitude;
 
     /**
-     * 解除人
+     * 报警是否解除 1已解除2未解除
      */
-    private String releasedBy;
+    private Integer isLock;
 
     /**
      * 解除时间
@@ -74,4 +74,9 @@ public class MsgAlarmResp implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
+    /**
+     * 相机编码
+     */
+    private String cameraCode;
+
 }

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

@@ -56,7 +56,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     lw.eq(BaseCameraManagement::getId, accountManagement.getCameraCode());
                 }
                 BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
-                if (!ObjectUtils.isEmpty(baseAccountManagement)) {
+                if (ObjectUtils.isEmpty(baseAccountManagement)) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     baseCameraManagementMapper.insert(accountManagement);
                     successNum++;

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

@@ -54,7 +54,7 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
                     lw.eq(BaseRailwayManagement::getRailwayCode, railwayManagement.getRailwayCode());
                 }
                 BaseRailwayManagement baseLineManagement = baseRailwayManagementMapper.selectOne(lw);
-                if (!ObjectUtils.isEmpty(baseLineManagement)) {
+                if (ObjectUtils.isEmpty(baseLineManagement)) {
                     BeanValidators.validateWithException(validator, railwayManagement);
                     baseRailwayManagementMapper.insert(railwayManagement);
                     successNum++;