item：预案同步修改提交

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

@@ -2,7 +2,6 @@ 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
@@ -13,6 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @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

@@ -2,7 +2,6 @@ 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
@@ -13,6 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @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/ContingencyPlanInstanceMapper.java

@@ -2,7 +2,6 @@ package com.boot.bus.sqlsync.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @ProjectName: amos-boot-bus
@@ -13,6 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date: 2022/6/9 18:00
  * @Version: 1.0
  */
-@Mapper
 public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPlanInstance> {
 }

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

@@ -2,7 +2,9 @@ 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;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @ProjectName: amos-boot-bus
@@ -13,6 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date: 2022/6/10 16:27
  * @Version: 1.0
  */
-@Mapper
 public interface PlanOperationRecordMapper extends BaseMapper<PlanOperationRecord> {
+    void saveOrUpdateBatch(@Param("list") List<PlanOperationRecord> 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

@@ -47,7 +47,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void handlerMqttIncrementMessage(String topic, String message) {
-        log.info(String.format("收到mqtt消息：%s", message));
         DataSyncMessage dataSyncMessage = JSON.parseObject(message, DataSyncMessage.class);
         List<Serializable> data = dataSyncMessage.getData();
         DataSyncTypeEnum type = dataSyncMessage.getType();

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

@@ -6,6 +6,7 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,6 +23,10 @@ import java.util.stream.Collectors;
  */
 @Service
 public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRecordMapper, PlanOperationRecord> implements IPlanOperationRecordService {
+
+    @Autowired
+    private PlanOperationRecordMapper planOperationRecordMapper;
+
     @Override
     public void astDeleteByIds(List<Long> ids) {
         if (!ids.isEmpty()) {
@@ -37,7 +42,8 @@ public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRec
                 BeanUtils.copyProperties(x, data);
                 return data;
             }).collect(Collectors.toList());
-            saveOrUpdateBatch(collect);
+//            saveOrUpdateBatch(collect);
+            planOperationRecordMapper.saveOrUpdateBatch(collect);
         }
     }
 }
\ No newline at end of file

amos-boot-system-sqlsync/src/main/java/com/boot/bus/sqlsync/AmosSqlSyncApplication.java

@@ -28,8 +28,8 @@ import java.net.UnknownHostException;
 @EnableAsync
 @EnableScheduling
 @EnableEurekaClient
-@MapperScan({"com.boot.bus.sqlsync.mapper"})
 @ComponentScan(value = {"com.boot.bus"})
+@MapperScan(basePackages = {"com.boot.bus.sqlsync.mapper"})
 public class AmosSqlSyncApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(AmosSqlSyncApplication.class);

amos-boot-system-sqlsync/src/main/resources/application.properties

@@ -7,11 +7,12 @@ spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
 
-## mybatis-plus
+#mybatis mapper file
+mybatis.mapper-locations=classpath:db/mapper/*.xml
+#mybatis-plus
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
-mybatis-plus.global-config.db-config.update-strategy=ignored
-mybatis.interceptor.enabled = false
+# mybatis entity package
+mybatis.type-aliases-package=com.yeejoin.amos.fas.dao.entity
 
 ## DB properties:
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -26,7 +27,7 @@ spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
 ##liquibase
-spring.liquibase.change-log = classpath:/changelog/changelog-master.xml
+spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled= true
 
 ## eureka properties:

amos-boot-system-sqlsync/src/main/resources/db/mapper/PlanOperationRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace=" com.boot.bus.sqlsync.mapper.PlanOperationRecordMapper">
+
+  <update id="saveOrUpdateBatch" parameterType="list">
+    <if test="list != null and list.size() >0">
+      REPLACE INTO  c_plan_operation_record ( id, `plan_id`, `plan_pattern`, `status`, execution_type, start_time, end_time,
+        `create_date`, `batch_no`, `is_delete`, start_user_name, start_user_id,
+        `equipment_code`, `equipment_name`, `equipment_id`, fire_equipment_id) VALUES
+      <foreach collection="list" item="item" index="index" open="" close=";" separator=",">
+        (#{item.id},#{item.planId},#{item.planPattern},#{item.status},#{item.executionType}, #{item.startTime},#{item.endTime},
+        #{item.createDate},#{item.batchNo},#{item.isDelete},#{item.startUserName},#{item.startUserId},
+        #{item.equipmentCode},#{item.equipmentName},#{item.equipmentId},#{item.fireEquipmentId})
+      </foreach>
+    </if>
+  </update>
+
+</mapper>
\ No newline at end of file