Commit 8db56518 authored by 高建强's avatar 高建强

item:数据同步,调整包路径

parent 18a729c4
package com.yeejoin.amos.fas.datasync; package com.yeejoin.amos.fas.datasync.message;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum; import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;
......
...@@ -17,8 +17,6 @@ import com.yeejoin.amos.fas.business.action.result.ActionResult; ...@@ -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.SafteyPlanResult;
import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage; 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.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.PlanDetailMapper;
import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper; import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
import com.yeejoin.amos.fas.business.dao.repository.IPlanDetailDao; import com.yeejoin.amos.fas.business.dao.repository.IPlanDetailDao;
...@@ -41,6 +39,8 @@ import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance; ...@@ -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.Equipment;
import com.yeejoin.amos.fas.dao.entity.PlanDetail; import com.yeejoin.amos.fas.dao.entity.PlanDetail;
import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
package com.yeejoin.amos.fas.business.dao.mapper; 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 org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
package com.yeejoin.amos.fas.business.dao.mapper; 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.business.vo.PlanDetailVo;
import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import javax.xml.crypto.Data;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
package com.yeejoin.amos.fas.business.dao.mapper; package com.yeejoin.amos.fas.business.dao.mapper;
import com.yeejoin.amos.fas.business.bo.PlanOperationRecordSyncBo; import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
...@@ -8,6 +8,7 @@ import java.util.List; ...@@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
...@@ -29,7 +30,6 @@ import com.yeejoin.amos.fas.business.action.ContingencyAction; ...@@ -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.ContingencyEvent;
import com.yeejoin.amos.fas.business.action.model.ContingencyRo; import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher; 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.bo.FirePlanAlarmBo;
import com.yeejoin.amos.fas.business.dao.mapper.*; import com.yeejoin.amos.fas.business.dao.mapper.*;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao; import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
......
...@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.component.rule.config.ClazzUtils; import com.yeejoin.amos.component.rule.config.ClazzUtils;
import com.yeejoin.amos.fas.business.action.CustomerAction; 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.mapper.*;
import com.yeejoin.amos.fas.business.dao.repository.*; import com.yeejoin.amos.fas.business.dao.repository.*;
import com.yeejoin.amos.fas.business.param.AlarmParam; import com.yeejoin.amos.fas.business.param.AlarmParam;
...@@ -21,6 +19,8 @@ import com.yeejoin.amos.fas.core.enums.NumberEnum; ...@@ -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.enums.ReserveEnum;
import com.yeejoin.amos.fas.core.util.DateUtil; import com.yeejoin.amos.fas.core.util.DateUtil;
import com.yeejoin.amos.fas.dao.entity.*; 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 com.yeejoin.amos.fas.exception.YeeException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
......
package com.yeejoin.amos.fas.business.service.impl; 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.service.intfc.IDataSyncService; import com.yeejoin.amos.fas.business.service.intfc.IDataSyncService;
import com.yeejoin.amos.fas.business.util.DataSyncUtil; import com.yeejoin.amos.fas.business.util.DataSyncUtil;
import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum; import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;
import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance; import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
import com.yeejoin.amos.fas.datasync.DataSyncMessage; 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.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -8,7 +8,6 @@ import com.yeejoin.amos.component.rule.RuleTrigger; ...@@ -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.model.ContingencyRo;
import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent; import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
import com.yeejoin.amos.fas.business.action.mq.WebMqttSubscribe; 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.bo.SafetyExecuteBo;
import com.yeejoin.amos.fas.business.dao.mapper.*; import com.yeejoin.amos.fas.business.dao.mapper.*;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao; import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
...@@ -27,6 +26,7 @@ import com.yeejoin.amos.fas.client.invoke.RsDataQueue; ...@@ -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.common.enums.EquipmentRiskTypeEnum;
import com.yeejoin.amos.fas.core.util.StringUtil; import com.yeejoin.amos.fas.core.util.StringUtil;
import com.yeejoin.amos.fas.dao.entity.*; import com.yeejoin.amos.fas.dao.entity.*;
import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
...@@ -40,6 +40,7 @@ import com.yeejoin.amos.fas.core.enums.ReserveEnum; ...@@ -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.DateUtil;
import com.yeejoin.amos.fas.core.util.StringUtil; import com.yeejoin.amos.fas.core.util.StringUtil;
import com.yeejoin.amos.fas.dao.entity.*; 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.fas.exception.YeeException;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
......
package com.yeejoin.amos.fas.business.service.intfc; 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.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; import java.util.Collection;
......
package com.yeejoin.amos.fas.business.util; 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.common.enums.DataSyncOperationEnum; import com.yeejoin.amos.fas.common.enums.DataSyncOperationEnum;
import com.yeejoin.amos.fas.common.enums.DataSyncTypeEnum; import com.yeejoin.amos.fas.common.enums.DataSyncTypeEnum;
import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance; import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
import com.yeejoin.amos.fas.datasync.DataSyncMessage; 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 org.springframework.beans.BeanUtils;
import java.io.Serializable; import java.io.Serializable;
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
UPDATE c_plan_operation_record SET `status`=1; UPDATE c_plan_operation_record SET `status`=1;
UPDATE c_plan_operation_record SET `end_time`=#{date} ORDER BY id DESC LIMIT 1; UPDATE c_plan_operation_record SET `end_time`=#{date} ORDER BY id DESC LIMIT 1;
</update> </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 SELECT
pd.*, pd.*,
ct.classify_name ct.classify_name
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
ORDER BY cpor.start_time DESC ORDER BY cpor.start_time DESC
LIMIT #{start}, #{size} LIMIT #{start}, #{size}
</select> </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 SELECT
por.*, por.*,
pd.plan_name, pd.plan_name,
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
OR m.equipment_Name like concat('%',#{contingencyName},'%') OR m.equipment_Name like concat('%',#{contingencyName},'%')
</if> </if>
</select> </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 SELECT
* *
FROM FROM
......
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
<repository> <repository>
<id>Releases</id> <id>Releases</id>
<name>Releases</name> <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>
<repository> <repository>
<id>Snapshots</id> <id>Snapshots</id>
<name>Snapshots</name> <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>
<repository> <repository>
<id>maven-public-ty</id> <id>maven-public-ty</id>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<pluginRepository> <pluginRepository>
<id>public</id> <id>public</id>
<name>Public Repositories</name> <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> </pluginRepository>
</pluginRepositories> </pluginRepositories>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment