Merge branch 'dev_upgrade' of…

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanOperationRecord.java

 package com.yeejoin.amos.fas.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -16,6 +17,7 @@ import java.util.Date;
 @Entity
 @Table(name="c_plan_operation_record")
 @NamedQuery(name="PlanOperationRecord.findAll", query="SELECT e FROM PlanOperationRecord e")
+@TableName("c_plan_operation_record")
 public class PlanOperationRecord extends BasicEntity {
 
     /**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/BasicEntityBo.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/bo/BasicEntityBo.java

-package com.yeejoin.amos.fas.business.bo;
+package com.yeejoin.amos.fas.datasync.bo;
 
 import lombok.Data;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/BusinessEntityBo.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/bo/BusinessEntityBo.java

-package com.yeejoin.amos.fas.business.bo;
+package com.yeejoin.amos.fas.datasync.bo;
 
 
 import lombok.Data;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/ContingencyOriginalDataSyncBo.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/bo/ContingencyOriginalDataSyncBo.java

-package com.yeejoin.amos.fas.business.bo;
+package com.yeejoin.amos.fas.datasync.bo;
 
 import lombok.Data;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/PlanDetailSyncBo.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/bo/PlanDetailSyncBo.java

-package com.yeejoin.amos.fas.business.bo;
+package com.yeejoin.amos.fas.datasync.bo;
 
 import lombok.Data;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/PlanOperationRecordSyncBo.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/bo/PlanOperationRecordSyncBo.java

-package com.yeejoin.amos.fas.business.bo;
+package com.yeejoin.amos.fas.datasync.bo;
 
 import lombok.Data;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/datasync/DataSyncMessage.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/datasync/message/DataSyncMessage.java

-package com.yeejoin.amos.fas.business.datasync;
+package com.yeejoin.amos.fas.datasync.message;
 
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -17,8 +17,6 @@ import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.result.SafteyPlanResult;
 import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage;
 import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher;
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanDetailMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IPlanDetailDao;
@@ -41,6 +39,8 @@ import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.PlanDetail;
 import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -754,14 +754,14 @@ public class ContingencyAction implements CustomerAction {
         }
 
         //  结束预案 更新预案记录表,预案状态
-        PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(contingencyRo.getBatchNo());
-        if (planOperationRecord != null && planOperationRecord.getStatus() == PlanRecordStatusEnum.OPERATION.getCode()) {
-            planOperationRecord.setStatus(PlanRecordStatusEnum.COMPLETE.getCode());
-            planOperationRecord.setEndTime(new Date());
-            PlanOperationRecord record = planOperationRecordDao.save(planOperationRecord);
+        PlanOperationRecord PlanOperationRecord = planOperationRecordDao.findByBatchNo(contingencyRo.getBatchNo());
+        if (PlanOperationRecord != null && PlanOperationRecord.getStatus() == PlanRecordStatusEnum.OPERATION.getCode()) {
+            PlanOperationRecord.setStatus(PlanRecordStatusEnum.COMPLETE.getCode());
+            PlanOperationRecord.setEndTime(new Date());
+            PlanOperationRecord record = planOperationRecordDao.save(PlanOperationRecord);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);
-            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(planOperationRecord.getPlanId());
+            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(PlanOperationRecord.getPlanId());
             if (optionalPlanDetail.get() != null) {
                 PlanDetail planDetail = optionalPlanDetail.get();
                 planDetail.setStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode());
@@ -975,14 +975,14 @@ public class ContingencyAction implements CustomerAction {
      */
     public void updateNumberPlan(String batchNo) {
         //  结束预案 更新预案记录表,预案状态
-        PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
-        if (planOperationRecord != null) {
-            planOperationRecord.setStatus(PlanRecordStatusEnum.INTERRUPT.getCode());
-            planOperationRecord.setEndTime(new Date());
-            PlanOperationRecord record = planOperationRecordDao.save(planOperationRecord);
+        PlanOperationRecord PlanOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
+        if (PlanOperationRecord != null) {
+            PlanOperationRecord.setStatus(PlanRecordStatusEnum.INTERRUPT.getCode());
+            PlanOperationRecord.setEndTime(new Date());
+            PlanOperationRecord record = planOperationRecordDao.save(PlanOperationRecord);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);
-            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(planOperationRecord.getPlanId());
+            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(PlanOperationRecord.getPlanId());
             if (optionalPlanDetail.get() != null) {
                 PlanDetail planDetail = optionalPlanDetail.get();
                 planDetail.setStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyOriginalMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
 import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import javax.xml.crypto.Data;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanOperationRecordMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
-import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import org.springframework.stereotype.Repository;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -29,7 +30,6 @@ import com.yeejoin.amos.fas.business.action.ContingencyAction;
 import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher;
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
 import com.yeejoin.amos.fas.business.bo.FirePlanAlarmBo;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.rule.config.ClazzUtils;
 import com.yeejoin.amos.fas.business.action.CustomerAction;
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.*;
 import com.yeejoin.amos.fas.business.param.AlarmParam;
@@ -21,6 +19,8 @@ import com.yeejoin.amos.fas.core.enums.NumberEnum;
 import com.yeejoin.amos.fas.core.enums.ReserveEnum;
 import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.exception.YeeException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -166,24 +166,24 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             }
 
             //插入运行记录表
-            PlanOperationRecord planOperationRecord = new PlanOperationRecord();
-            planOperationRecord.setStatus(PlanRecordStatusEnum.OPERATION.getCode());
-            planOperationRecord.setPlanId(PlanDetailOp.get().getId());
-            planOperationRecord.setIsDelete(false);
-            planOperationRecord.setStartTime(new Date());
-            planOperationRecord.setPlanPattern(vo.getStatus());
-            planOperationRecord.setStartUserId(vo.getUserId());
-            planOperationRecord.setStartUserName(vo.getUserName());
-            planOperationRecord.setEquipmentCode(equipmentSpecific.getCode());
-            planOperationRecord.setEquipmentName(equipmentSpecific.getName());
-            planOperationRecord.setEquipmentId(equipmentSpecific.getId());
-            planOperationRecord.setFireEquipmentId(equipment.getId());
+            PlanOperationRecord PlanOperationRecord = new PlanOperationRecord();
+            PlanOperationRecord.setStatus(PlanRecordStatusEnum.OPERATION.getCode());
+            PlanOperationRecord.setPlanId(PlanDetailOp.get().getId());
+            PlanOperationRecord.setIsDelete(false);
+            PlanOperationRecord.setStartTime(new Date());
+            PlanOperationRecord.setPlanPattern(vo.getStatus());
+            PlanOperationRecord.setStartUserId(vo.getUserId());
+            PlanOperationRecord.setStartUserName(vo.getUserName());
+            PlanOperationRecord.setEquipmentCode(equipmentSpecific.getCode());
+            PlanOperationRecord.setEquipmentName(equipmentSpecific.getName());
+            PlanOperationRecord.setEquipmentId(equipmentSpecific.getId());
+            PlanOperationRecord.setFireEquipmentId(equipment.getId());
             if (ContingencyPlanStatusEnum.SIMULATION_START.getCode().equals(vo.getStatus())) {
-                planOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
+                PlanOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
             } else {
-                planOperationRecord.setExecutionType(ExecutionTypeEnum.FIREMANAGEMENT.getCode());
+                PlanOperationRecord.setExecutionType(ExecutionTypeEnum.FIREMANAGEMENT.getCode());
             }
-            PlanOperationRecord operationRecord = planOperationRecordDao.save(planOperationRecord);
+            PlanOperationRecord operationRecord = planOperationRecordDao.save(PlanOperationRecord);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(operationRecord);
             //预案启动
@@ -227,30 +227,30 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Override
     public Map<String, Object> firstGetRecord(String batchNo) {
         Map<String, Object> map = new HashMap<>();
-        PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
-        if (planOperationRecord == null) {
+        PlanOperationRecord PlanOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
+        if (PlanOperationRecord == null) {
             throw new YeeException("执行记录不存在");
         } else {
-            PlanDetail planDetail = planDetailDao.getOne(planOperationRecord.getPlanId());
+            PlanDetail planDetail = planDetailDao.getOne(PlanOperationRecord.getPlanId());
             if (planDetail == null) {
                 throw new YeeException("数字预案模型被删除");
             }
-            map.put("status", planOperationRecord.getStatus());
-            if (PlanRecordStatusEnum.OPERATION == PlanRecordStatusEnum.getEnum(planOperationRecord.getStatus())) {
-                map.put("executionTime", (System.currentTimeMillis() - planOperationRecord.getStartTime().getTime()) / 1000);
+            map.put("status", PlanOperationRecord.getStatus());
+            if (PlanRecordStatusEnum.OPERATION == PlanRecordStatusEnum.getEnum(PlanOperationRecord.getStatus())) {
+                map.put("executionTime", (System.currentTimeMillis() - PlanOperationRecord.getStartTime().getTime()) / 1000);
             } else {
-                map.put("executionTime", (planOperationRecord.getEndTime().getTime() - planOperationRecord.getStartTime().getTime()) / 1000);
+                map.put("executionTime", (PlanOperationRecord.getEndTime().getTime() - PlanOperationRecord.getStartTime().getTime()) / 1000);
             }
-            map.put("crateDate", planOperationRecord.getStartTime());
-            if (ContingencyPlanStatusEnum.getEnum(planOperationRecord.getPlanPattern()) == ContingencyPlanStatusEnum.SIMULATION_START) {
-                map.put("userName", planOperationRecord.getStartUserName());
+            map.put("crateDate", PlanOperationRecord.getStartTime());
+            if (ContingencyPlanStatusEnum.getEnum(PlanOperationRecord.getPlanPattern()) == ContingencyPlanStatusEnum.SIMULATION_START) {
+                map.put("userName", PlanOperationRecord.getStartUserName());
                 map.put("startType", "手动");
             } else {
                 map.put("userName", "系统");
                 map.put("startType", "自动");
             }
-            map.put("executionType", planOperationRecord.getExecutionType());
-            map.put("equipmentName", planOperationRecord.getEquipmentName());
+            map.put("executionType", PlanOperationRecord.getExecutionType());
+            map.put("equipmentName", PlanOperationRecord.getEquipmentName());
             map.put("PlanName", planDetail.getPlanName());
         }
         return map;
@@ -308,9 +308,9 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 }
                 List<PlanDetail> countMn = planDetailDao.findByStatus((Integer[]) Arrays.asList(ContingencyPlanStatusEnum.SIMULATION_START.getCode()).toArray());
                 if (countMn.size() > NumberEnum.ZERO.getValue()) {
-                    List<PlanOperationRecord> planOperationRecordList = planOperationRecordDao.findByPlanId1(countMn.get(0).getId());
-                    if (planOperationRecordList.size() > 0) {
-                        Optional<Equipment> equipment = iContingencyInstance.fire(planOperationRecordList.get(0).getBatchNo(), "0", "", "FIRE_CANCEL", "CONFIRM", "B");
+                    List<PlanOperationRecord> PlanOperationRecordList = planOperationRecordDao.findByPlanId1(countMn.get(0).getId());
+                    if (PlanOperationRecordList.size() > 0) {
+                        Optional<Equipment> equipment = iContingencyInstance.fire(PlanOperationRecordList.get(0).getBatchNo(), "0", "", "FIRE_CANCEL", "CONFIRM", "B");
                         //  结束预案，更新设备重点设备参数
                         equipment.ifPresent(equip -> {
                             equip.setStartTime(DateUtil.getDateNow());
@@ -319,7 +319,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                             equip.setStatus(NumberEnum.ONE.getValue());
                             equipmentService.save(equip);
                         });
-                        customerAction.intreeuptPlan(planOperationRecordList.get(0).getBatchNo());
+                        customerAction.intreeuptPlan(PlanOperationRecordList.get(0).getBatchNo());
                     }
                 }
 
@@ -751,8 +751,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             // 运行中的设置为重置
             List<PlanOperationRecord> planList = planOperationRecordDao.findByStatus(0);
             if (!planList.isEmpty()) {
-                planList.forEach(planOperationRecord -> {
-                    String batchNo = planOperationRecord.getBatchNo();
+                planList.forEach(PlanOperationRecord -> {
+                    String batchNo = PlanOperationRecord.getBatchNo();
                     redisTemplate.delete(RiskSourceServiceImpl.cacheKeyForCanBeRunning());
                     Optional<Equipment> equipment;
                     try {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/DataSyncServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
-import com.yeejoin.amos.fas.business.datasync.DataSyncMessage;
 import com.yeejoin.amos.fas.business.service.intfc.IDataSyncService;
 import com.yeejoin.amos.fas.business.util.DataSyncUtil;
 import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
+import com.yeejoin.amos.fas.datasync.message.DataSyncMessage;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -8,7 +8,6 @@ import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttSubscribe;
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
 import com.yeejoin.amos.fas.business.bo.SafetyExecuteBo;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
@@ -27,6 +26,7 @@ import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.EquipmentRiskTypeEnum;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -40,6 +40,7 @@ import com.yeejoin.amos.fas.core.enums.ReserveEnum;
 import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.ArrayUtils;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IDataSyncService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
 
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 
 import java.util.Collection;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/DataSyncUtil.java

 package com.yeejoin.amos.fas.business.util;
 
 
-import com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo;
-import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo;
-import com.yeejoin.amos.fas.business.datasync.DataSyncMessage;
 import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;
 import com.yeejoin.amos.fas.common.enums.DataSyncTypeEnum;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
+import com.yeejoin.amos.fas.datasync.message.DataSyncMessage;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -139,7 +139,7 @@
     UPDATE c_plan_operation_record SET `status`=1;
     UPDATE c_plan_operation_record SET `end_time`=#{date} ORDER BY id DESC LIMIT 1;
   </update>
-  <select id="getPlanDetailSyncBoList" resultType="com.yeejoin.amos.fas.business.bo.PlanDetailSyncBo" parameterType="java.util.Map">
+  <select id="getPlanDetailSyncBoList" resultType="com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo" parameterType="java.util.Map">
     SELECT
       pd.*,
       ct.classify_name

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanOperationRecordMapper.xml

@@ -88,7 +88,7 @@
     ORDER BY cpor.start_time DESC
     LIMIT #{start}, #{size}
   </select>
-  <select id="getPlanOperationRecordSyncBoList" resultType="com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo" parameterType="java.util.Map">
+  <select id="getPlanOperationRecordSyncBoList" resultType="com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo" parameterType="java.util.Map">
     SELECT
       por.*,
       pd.plan_name,

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_contingencyOriginal.xml

@@ -58,7 +58,7 @@
 			OR m.equipment_Name like concat('%',#{contingencyName},'%')
 		</if>
 	</select>
-	<select id="getContingencyOriginalDataBoList" resultType="com.yeejoin.amos.fas.business.bo.ContingencyOriginalDataSyncBo" parameterType="java.util.Map">
+	<select id="getContingencyOriginalDataBoList" resultType="com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo" parameterType="java.util.Map">
 		SELECT
 			*
 		FROM

pom.xml

@@ -233,12 +233,12 @@
 	  <repository>
 		  <id>Releases</id>
 		  <name>Releases</name>
-		  <url>http://172.16.1.6:8081/nexus/content/repositories/releases/</url>
+		  <url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
 	  </repository>
 	  <repository>
 		  <id>Snapshots</id>
 		  <name>Snapshots</name>
-		  <url>http://172.16.1.6:8081/nexus/content/repositories/snapshots/</url>
+		  <url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url>
 	  </repository>
 	<repository>
 		<id>maven-public-ty</id>
@@ -256,7 +256,7 @@
     <pluginRepository>
       <id>public</id>
       <name>Public Repositories</name>
-      <url>http://172.16.1.6:8081/nexus/content/groups/public/</url>
+      <url>http://36.46.149.14:8081/nexus/content/groups/public/</url>
     </pluginRepository>
 
   </pluginRepositories>