Merge remote-tracking branch 'origin/develop' into develop

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/mapper/ContingencyOriginalDataMapper.java

+package com.boot.bus.sqlsync.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.mapper
+ * @ClassName: ContingencyOriginalDataMapper
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:27
+ * @Version: 1.0
+ */
+@Mapper
+public interface ContingencyOriginalDataMapper extends BaseMapper<ContingencyOriginalData> {
+}

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/mapper/ContingencyPlanDetailMapper.java

+package com.boot.bus.sqlsync.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.fas.dao.entity.PlanDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.mapper
+ * @ClassName: ContingencyPlanDetailMapper
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:27
+ * @Version: 1.0
+ */
+@Mapper
+public interface ContingencyPlanDetailMapper extends BaseMapper<PlanDetail> {
+}

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/mapper/PlanOperationRecordMapper.java

+package com.boot.bus.sqlsync.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.mapper
+ * @ClassName: PlanOperationRecordMapper
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:27
+ * @Version: 1.0
+ */
+@Mapper
+public interface PlanOperationRecordMapper extends BaseMapper<PlanOperationRecord> {
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/impl/ContingencyOriginalDataServiceImpl.java

+package com.boot.bus.sqlsync.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.boot.bus.sqlsync.mapper.ContingencyOriginalDataMapper;
+import com.boot.bus.sqlsync.service.infc.IContingencyOriginalDataService;
+import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.impl
+ * @ClassName: ContingencyOriginalDataServiceImpl
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:06
+ * @Version: 1.0
+ */
+@Service
+public class ContingencyOriginalDataServiceImpl extends ServiceImpl<ContingencyOriginalDataMapper, ContingencyOriginalData> implements IContingencyOriginalDataService {
+
+    @Override
+    public void astDeleteByIds(List<String> ids) {
+        if (!ids.isEmpty()) {
+            baseMapper.deleteBatchIds(ids);
+        }
+    }
+
+    @Override
+    public void astSaveOrUpdateBatch(List<ContingencyOriginalDataSyncBo> list) {
+        if (!list.isEmpty()) {
+            List<ContingencyOriginalData> collect = list.stream().map(x -> {
+                ContingencyOriginalData data = new ContingencyOriginalData();
+                BeanUtils.copyProperties(x, data);
+                return data;
+            }).collect(Collectors.toList());
+            saveOrUpdateBatch(collect);
+        }
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/impl/ContingencyPlanDetailServiceImpl.java

+package com.boot.bus.sqlsync.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.boot.bus.sqlsync.mapper.ContingencyPlanDetailMapper;
+import com.boot.bus.sqlsync.service.infc.IContingencyPlanDetailService;
+import com.yeejoin.amos.fas.dao.entity.PlanDetail;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.impl
+ * @ClassName: ContingencyPlanDetailServiceImpl
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:06
+ * @Version: 1.0
+ */
+@Service
+public class ContingencyPlanDetailServiceImpl extends ServiceImpl<ContingencyPlanDetailMapper, PlanDetail> implements IContingencyPlanDetailService {
+    @Override
+    public void astDeleteByIds(List<Long> ids) {
+        if (!ids.isEmpty()) {
+            baseMapper.deleteBatchIds(ids);
+        }
+    }
+
+    @Override
+    public void astSaveOrUpdateBatch(List<PlanDetailSyncBo> list) {
+        if (!list.isEmpty()) {
+            List<PlanDetail> collect = list.stream().map(x -> {
+                PlanDetail data = new PlanDetail();
+                BeanUtils.copyProperties(x, data);
+                return data;
+            }).collect(Collectors.toList());
+            saveOrUpdateBatch(collect);
+        }
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/impl/MqttReceiveServiceImpl.java

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.boot.bus.sqlsync.enums.DataSyncOperationEnum;
 import com.boot.bus.sqlsync.enums.DataSyncTypeEnum;
 import com.boot.bus.sqlsync.message.DataSyncMessage;
-import com.boot.bus.sqlsync.service.infc.IContingencyPlanInstance;
-import com.boot.bus.sqlsync.service.infc.MqttReceiveService;
+import com.boot.bus.sqlsync.service.infc.*;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +31,16 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class MqttReceiveServiceImpl implements MqttReceiveService {
+
+    @Autowired
+    private IContingencyPlanDetailService contingencyPlanDetailService;
+
+    @Autowired
+    private IPlanOperationRecordService planOperationRecordService;
+
+    @Autowired
+    private IContingencyOriginalDataService contingencyOriginalDataService;
+
     @Autowired
     private IContingencyPlanInstance contingencyPlanInstance;
 
@@ -45,6 +57,42 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             return;
         }
         switch (type) {
+            case CONTINGENCY_PLAN_DETAIL: {
+                switch (operation) {
+                    case DELETE: {
+                        contingencyPlanDetailService.astDeleteByIds(data.stream().map(x -> ((JSONObject) x).toJavaObject(PlanDetailSyncBo.class).getId()).collect(Collectors.toList()));
+                        break;
+                    }
+                    default: {
+                        contingencyPlanDetailService.astSaveOrUpdateBatch(data.stream().map(x -> ((JSONObject) x).toJavaObject(PlanDetailSyncBo.class)).collect(Collectors.toList()));
+                    }
+                }
+                break;
+            }
+            case CONTINGENCY_PLAN_OPERATION_RECORD: {
+                switch (operation) {
+                    case DELETE: {
+                        planOperationRecordService.astDeleteByIds(data.stream().map(x -> ((JSONObject) x).toJavaObject(PlanOperationRecordSyncBo.class).getId()).collect(Collectors.toList()));
+                        break;
+                    }
+                    default: {
+                        planOperationRecordService.astSaveOrUpdateBatch(data.stream().map(x -> ((JSONObject) x).toJavaObject(PlanOperationRecordSyncBo.class)).collect(Collectors.toList()));
+                    }
+                }
+                break;
+            }
+            case CONTINGENCY_ORIGINAL_DATA: {
+                switch (operation) {
+                    case DELETE: {
+                        contingencyOriginalDataService.astDeleteByIds(data.stream().map(x -> ((JSONObject) x).toJavaObject(ContingencyOriginalDataSyncBo.class).getId()).collect(Collectors.toList()));
+                        break;
+                    }
+                    default: {
+                        contingencyOriginalDataService.astSaveOrUpdateBatch(data.stream().map(x -> ((JSONObject) x).toJavaObject(ContingencyOriginalDataSyncBo.class)).collect(Collectors.toList()));
+                    }
+                }
+                break;
+            }
             case CONTINGENCY_PLAN_INSTANCE: {
                 switch (operation) {
                     case DELETE: {

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/impl/PlanOperationRecordServiceImpl.java

+package com.boot.bus.sqlsync.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.boot.bus.sqlsync.mapper.PlanOperationRecordMapper;
+import com.boot.bus.sqlsync.service.infc.IPlanOperationRecordService;
+import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.impl
+ * @ClassName: PlanOperationRecordServiceImpl
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:05
+ * @Version: 1.0
+ */
+@Service
+public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRecordMapper, PlanOperationRecord> implements IPlanOperationRecordService {
+    @Override
+    public void astDeleteByIds(List<Long> ids) {
+        if (!ids.isEmpty()) {
+            baseMapper.deleteBatchIds(ids);
+        }
+    }
+
+    @Override
+    public void astSaveOrUpdateBatch(List<PlanOperationRecordSyncBo> list) {
+        if (!list.isEmpty()) {
+            List<PlanOperationRecord> collect = list.stream().map(x -> {
+                PlanOperationRecord data = new PlanOperationRecord();
+                BeanUtils.copyProperties(x, data);
+                return data;
+            }).collect(Collectors.toList());
+            saveOrUpdateBatch(collect);
+        }
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/infc/IContingencyOriginalDataService.java

+package com.boot.bus.sqlsync.service.infc;
+
+import com.yeejoin.amos.fas.datasync.bo.ContingencyOriginalDataSyncBo;
+
+import java.util.List;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.infc
+ * @ClassName: IPlanOperationRecordService
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:04
+ * @Version: 1.0
+ */
+public interface IContingencyOriginalDataService {
+
+    void astDeleteByIds(List<String> collect);
+
+    void astSaveOrUpdateBatch(List<ContingencyOriginalDataSyncBo> collect);
+}

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/infc/IContingencyPlanDetailService.java

+package com.boot.bus.sqlsync.service.infc;
+
+import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
+
+import java.util.List;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.infc
+ * @ClassName: IPlanOperationRecordService
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:04
+ * @Version: 1.0
+ */
+public interface IContingencyPlanDetailService {
+
+    void astSaveOrUpdateBatch(List<PlanDetailSyncBo> collect);
+
+    void astDeleteByIds(List<Long> collect);
+}

amos-boot-module/amos-boot-module-bus/amos-boot-module-sqlsync-bus/src/main/java/com/boot/bus/sqlsync/service/infc/IPlanOperationRecordService.java

+package com.boot.bus.sqlsync.service.infc;
+
+import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
+
+import java.util.List;
+
+/**
+ * @ProjectName: amos-boot-bus
+ * @Package: com.boot.bus.sqlsync.service.infc
+ * @ClassName: IPlanOperationRecordService
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2022/6/10 16:04
+ * @Version: 1.0
+ */
+public interface IPlanOperationRecordService {
+    void astDeleteByIds(List<Long> collect);
+
+    void astSaveOrUpdateBatch(List<PlanOperationRecordSyncBo> collect);
+}