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/PlanOperationRecordMapper.java

 package com.boot.bus.sqlsync.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import com.yeejoin.amos.fas.dao.entity.CPlanOperationRecord;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,6 +15,6 @@ import java.util.List;
  * @Date: 2022/6/10 16:27
  * @Version: 1.0
  */
-public interface PlanOperationRecordMapper extends BaseMapper<PlanOperationRecord> {
-    void saveOrUpdateBatch(@Param("list") List<PlanOperationRecord> collect);
+public interface PlanOperationRecordMapper extends BaseMapper<CPlanOperationRecord> {
+    void saveOrUpdateBatch(@Param("list") List<CPlanOperationRecord> 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/PlanOperationRecordServiceImpl.java

@@ -3,12 +3,13 @@ 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.dao.entity.CPlanOperationRecord;
 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 javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,9 +23,9 @@ import java.util.stream.Collectors;
  * @Version: 1.0
  */
 @Service
-public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRecordMapper, PlanOperationRecord> implements IPlanOperationRecordService {
+public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRecordMapper, CPlanOperationRecord> implements IPlanOperationRecordService {
 
-    @Autowired
+    @Resource
     private PlanOperationRecordMapper planOperationRecordMapper;
 
     @Override
@@ -37,13 +38,14 @@ public class PlanOperationRecordServiceImpl extends ServiceImpl<PlanOperationRec
     @Override
     public void astSaveOrUpdateBatch(List<PlanOperationRecordSyncBo> list) {
         if (!list.isEmpty()) {
-            List<PlanOperationRecord> collect = list.stream().map(x -> {
-                PlanOperationRecord data = new PlanOperationRecord();
+            List<CPlanOperationRecord> collect = list.stream().map(x -> {
+                CPlanOperationRecord data = new CPlanOperationRecord();
                 BeanUtils.copyProperties(x, data);
                 return data;
             }).collect(Collectors.toList());
-//            saveOrUpdateBatch(collect);
-            planOperationRecordMapper.saveOrUpdateBatch(collect);
+            saveOrUpdateBatch(collect);
+//            final String s = planOperationRecordMapper.toString();
+//            System.out.println(s);
         }
     }
 }
\ No newline at end of file

amos-boot-system-sqlsync/pom.xml

@@ -16,8 +16,20 @@
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-sqlsync-bus</artifactId>
             <version>${amos-boot-bus.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-spring</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>2.0.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-autoconfigure</artifactId>-->
 <!--        </dependency>-->

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

@@ -14,5 +14,4 @@
       </foreach>
     </if>
   </update>
-
 </mapper>
\ No newline at end of file