Browse Source

准生产环境的交付数据,同步至客户生产环境 增加记录日志接口,增加日志查看接口

lvxianyun 3 years ago
parent
commit
ad79b0387c

+ 33 - 2
src/main/java/com/persagy/proxy/migration/controller/DataMigrationController.java

@@ -5,11 +5,17 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.migrate.client.DigitalMigrateLogFacade;
+import com.persagy.dmp.rwd.migrate.entity.SyncData;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
+import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.migration.handler.DataMigrationHandler;
 import com.persagy.proxy.migration.model.DataMigrationExcel;
@@ -104,11 +110,11 @@ public class DataMigrationController {
                 }
             }
         } catch (Exception e) {
-            log.error("数据迁移失败",e);
+            log.error("数据迁移内容获取失败",e);
         }
     }
 
-    @PostMapping("/log")
+    @PostMapping("/start")
     public AdmResponse migrateForLog(@RequestBody MigrationInfo migrationInfo) {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
         context.setGroupCode(migrationInfo.getTargetGroupCode());
@@ -126,4 +132,29 @@ public class DataMigrationController {
         return AdmResponse.success();
     }
 
+    @PostMapping("/log")
+    public AdmResponse queryMigrateForLog(@RequestBody AdmQueryCriteria request) {
+        QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
+        CommonResult<List<SyncData>> result = DigitalMigrateLogFacade.query(context.getGroupCode(),context.getProjectId(),context.getAppId(), context.getUserId(),queryCriteria);
+        if(result.getResult().equals(DmpResult.SUCCESS)){
+            if(CollUtil.isEmpty(result.getData())){
+                return AdmResponse.success();
+            }
+            // 设置返回值
+            AdmResponse response = AdmResponse.success(result.getData());
+            Long total = result.getCount() == null ? null : result.getCount().longValue();
+            if(request.isOnlyCount()){
+                response.setTotal(null);
+                response.setCount(total);
+            }else {
+                response.setTotal(total);
+            }
+            response.setPageNumber(request.getPageNumber());
+            response.setPageSize(request.getPageSize());
+            return response;
+        } else {
+            return AdmResponse.failure(result.getMessage());
+        }
+    }
 }

+ 30 - 40
src/main/java/com/persagy/proxy/migration/handler/DefineInfoMigration.java

@@ -61,7 +61,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
      */
     @Override
     public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
-        log.info("######################### DefineInfo 同步开始 #########################");
+        log.info("######################### DefineInfo 数据迁移内容获取开始 #########################");
         long start = System.currentTimeMillis();
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
 
@@ -91,11 +91,11 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             log.error(" ######################### DefineInfo adm已交付需要同步的数据:"+ ResponseCode.C0320.getDesc() +" 同步结束 #########################");
             return dataMigrationExcels;
         }
-        String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
+        //String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
         if(CollUtil.isEmpty(projectDefineList)){
-            log.info("######################### DefineInfo 批量插入数据 #########################");
-            DataMigrationResponse response = insertBatch(admDefineList, ObjectInfoDefine.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(response, MigrationType.INSERT.getDesc()));
+            log.info("######################### DefineInfo 获取批量插入数据 #########################");
+            //DataMigrationResponse response = insertBatch(admDefineList, ObjectInfoDefine.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(admDefineList, MigrationType.INSERT.getDesc()));
             return dataMigrationExcels;
         }
         List<ObjectNode> objectNodeListPro = JsonNodeUtils.toListNode(projectDefineList, null, null);
@@ -105,25 +105,26 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
 
 
         //差集 新增
-        log.info("######################### DefineInfo 批量插入数据 #########################");
+        log.info("######################### DefineInfo 获取批量插入数据 #########################");
         Map<String,Object> subtractFromDel = doSubtractAdd(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(subtractFromDel)){
             List<ObjectInfoDefine> insertData = toList(subtractFromDel, admDefineList);
-            dataMigrationExcels.addAll(processDataForExcel(insertBatch(insertData, ObjectInfoDefine.class, insertUrl), MigrationType.INSERT.getDesc()));
+            dataMigrationExcels.addAll(processDataForExcel(insertData, MigrationType.INSERT.getDesc()));
         }
 
         //差集 删除
-        log.info("######################### DefineInfo 批量处理删除数据 #########################");
+        log.info("######################### DefineInfo 获取批量处理删除数据 #########################");
         Map<String,Object> subtractFromDelete = doSubtractDel(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(subtractFromDelete)){
             List<String> deleteIds = subtractFromDelete.entrySet().stream().map(en -> en.getKey()).collect(Collectors.toList());
-            String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
-            DataMigrationResponse response = deleteBatch(deleteIds, ObjectInfoDefine.class, delUrl);
-            dataMigrationExcels.addAll(processDataForExcel(response, MigrationType.DELETE.getDesc()));
+            //String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
+            //DataMigrationResponse response = deleteBatch(deleteIds, ObjectInfoDefine.class, delUrl);
+            List<ObjectInfoDefine> delData = toListByIds(deleteIds, admDefineList);
+            dataMigrationExcels.addAll(processDataForExcel(delData, MigrationType.DELETE.getDesc()));
         }
 
         //交集更新
-        log.info("######################### DefineInfo 批量处理更新数据 #########################");
+        log.info("######################### DefineInfo 获取批量处理更新数据 #########################");
         Map<String,Object> intersectionUpdateFrom = doIntersectionGetFrom(admDefineMap, projectDefineMap);
         Map<String,Object> intersectionUpdateTo = doIntersectionGetTo(admDefineMap, projectDefineMap);
 
@@ -131,12 +132,13 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             Map<String, Object> compareData = compareData(intersectionUpdateFrom, intersectionUpdateTo);
             if(CollUtil.isNotEmpty(compareData) && compareData.size() > 0){
                 List<ObjectInfoDefine> updateData = toList(compareData, admDefineList);
-                String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
-                dataMigrationExcels.addAll(processDataForExcel(updateBatch(updateData, ObjectInfoDefine.class, updateUrl), MigrationType.UPDATE.getCode()));
+                //String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
+                //updateBatch(updateData, ObjectInfoDefine.class, updateUrl)
+                dataMigrationExcels.addAll(processDataForExcel(updateData, MigrationType.UPDATE.getCode()));
             }
         }
         long end = System.currentTimeMillis();
-        log.info("######################### DefineInfo 数据迁移已结束 时间:"+(end-start)+" #########################");
+        log.info("######################### DefineInfo 数据迁移内容获取已结束 时间:"+(end-start)+" #########################");
 
         return dataMigrationExcels;
     }
@@ -294,35 +296,23 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
     /**
      * 将目标集合处理成excel格式的集合  使用与insert/delete
      *
-     * @param dataMigrationResponse
+     * @param list
      * @return
      */
     @Override
-    public List<DataMigrationExcel> processDataForExcel(DataMigrationResponse dataMigrationResponse, String type) {
-        if(CollUtil.isEmpty(dataMigrationResponse.getData()) && CollUtil.isEmpty(dataMigrationResponse.getErrorMsg())){
+    public List<DataMigrationExcel> processDataForExcel(Collection list, String type) {
+        if(CollUtil.isEmpty(list)){
             return Collections.emptyList();
         }
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getData())){
-            for(Object obj : dataMigrationResponse.getData()){
-                if(!type.equals(MigrationType.DELETE.getCode())){
-                    ObjectInfoDefine define = (ObjectInfoDefine) obj;
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(define.getId());
-                    excel.setCode(define.getCode());
-                    excel.setName(define.getName());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }else{
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(obj.toString());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }
-            }
-        }
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            dataMigrationExcels.addAll(addErrorInfo(dataMigrationResponse.getErrorMsg()));
+        for(Object obj : list){
+            ObjectInfoDefine define = (ObjectInfoDefine) obj;
+            DataMigrationExcel excel = new DataMigrationExcel();
+            excel.setId(define.getId());
+            excel.setCode(define.getCode());
+            excel.setName(define.getName());
+            excel.setType(type);
+            dataMigrationExcels.add(excel);
         }
         return dataMigrationExcels;
     }
@@ -349,12 +339,12 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
                 syncData.setName(infoDefine.getName());
                 syncData.setCode(infoDefine.getCode());
                 syncData.setClassCode(infoDefine.getClassCode());
-                syncData.setOps(type);//操作
+                syncData.setType(type);//操作
                 syncDataList.add(syncData);
             }
         }
         if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg()));
+            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg(),MigrationTable.DTDEFINEINFO.getCode()));
         }
         return syncDataList;
     }

+ 56 - 79
src/main/java/com/persagy/proxy/migration/handler/DefineTypeMigration.java

@@ -60,27 +60,11 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
      */
     @Override
     public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
-        log.info("######################### DefineType 同步开始 #########################");
+        log.info("######################### DefineType 数据迁移内容获取开始 #########################");
         long start = System.currentTimeMillis();
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
 
-        QueryCriteria queryCriteria = new QueryCriteria();
-        ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-        criteria.put("valid", 1);
-        ObjectNode groupCode =  JsonNodeFactory.instance.objectNode();
-        groupCode.put("$ne", "0");
-
-        ObjectNode projectId =  JsonNodeFactory.instance.objectNode();
-        projectId.put("$ne", "0");
-
-        ObjectNode andOr = JsonNodeFactory.instance.objectNode();
-        andOr.putPOJO("groupCode", projectId);
-        andOr.putPOJO("projectId", groupCode);
-
-        criteria.putPOJO("$andOr", andOr);
-
-        queryCriteria.setCriteria(criteria);
-        queryCriteria.setSize(-1L);
+        QueryCriteria queryCriteria = getQueryCriteria();
 
         List<ObjectTypeDefine> admDefineList = getAdmData(context, queryCriteria);
         String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
@@ -91,11 +75,11 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
             return dataMigrationExcels;
         }
 
-        String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
+        //String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
         if(CollUtil.isEmpty(objectNodeList)){
-            log.info("######################### DefineType 批量插入数据 #########################");
-            DataMigrationResponse dataMigrationResponse = insertBatch(admDefineList, ObjectTypeDefine.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            log.info("######################### DefineType 批量插入数据获取 #########################");
+            //DataMigrationResponse dataMigrationResponse = insertBatch(admDefineList, ObjectTypeDefine.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(admDefineList, MigrationType.INSERT.getDesc()));
 
             return dataMigrationExcels;
         }
@@ -105,28 +89,28 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
         Map<String,Object> admDefineMap = toEntityMap(objectNodeListAdm, ObjectTypeDefine.class);
 
         //差集 新增
-        log.info("######################### DefineType 批量处理新增数据 #########################");
+        log.info("######################### DefineType 批量处理新增数据获取 #########################");
         Map<String,Object> doSubtractFromInsert = doSubtractAdd(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(doSubtractFromInsert)){
             List<ObjectTypeDefine> insertData = toList(doSubtractFromInsert, admDefineList);
-            DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectTypeDefine.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            //DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectTypeDefine.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(insertData, MigrationType.INSERT.getDesc()));
         }
 
         //差集 删除
-        log.info("######################### DefineType 批量处理删除数据 #########################");
+        log.info("######################### DefineType 批量处理删除数据获取 #########################");
         Map<String,Object> doSubtractFromDelete = doSubtractDel(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(doSubtractFromDelete)){
             List<String> deleteIds = doSubtractFromDelete.entrySet().stream().map(en -> en.getKey()).collect(Collectors.toList());
-            List<ObjectTypeDefine> deleteData = toList(doSubtractFromDelete, projectDefineList);
+            List<ObjectTypeDefine> deleteData = toListByIds(deleteIds, projectDefineList);
 
-            String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
-            DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectTypeDefine.class, delUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.DELETE.getDesc()));
+            /*String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
+            DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectTypeDefine.class, delUrl);*/
+            dataMigrationExcels.addAll(processDataForExcel(deleteData, MigrationType.DELETE.getDesc()));
         }
 
         //交集更新
-        log.info("######################### DefineType 批量处理更新数据 #########################");
+        log.info("######################### DefineType 批量处理更新数据获取 #########################");
         Map<String,Object> intersectionUpdateFrom = doIntersectionGetFrom(admDefineMap, projectDefineMap);
         Map<String,Object> intersectionUpdateTo = doIntersectionGetTo(admDefineMap, projectDefineMap);
 
@@ -134,13 +118,13 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
             Map<String, Object> compareData = compareData(intersectionUpdateFrom, intersectionUpdateTo);
             if(CollUtil.isNotEmpty(compareData) && compareData.size() > 0){
                 List<ObjectTypeDefine> updateData = toList(compareData, admDefineList);
-                String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
-                DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectTypeDefine.class, updateUrl);
-                dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.UPDATE.getDesc()));
+                //String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
+                //DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectTypeDefine.class, updateUrl);
+                dataMigrationExcels.addAll(processDataForExcel(updateData, MigrationType.UPDATE.getDesc()));
             }
         }
         long end = System.currentTimeMillis();
-        log.info("######################### DefineType 数据迁移已结束 时间:"+(end-start)+" #########################");
+        log.info("######################### DefineType 数据迁移获取已结束 时间:"+(end-start)+" #########################");
         return dataMigrationExcels;
     }
 
@@ -150,23 +134,7 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
         long start = System.currentTimeMillis();
         List<SyncData> syncDataList = new ArrayList<>();
 
-        QueryCriteria queryCriteria = new QueryCriteria();
-        ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-        criteria.put("valid", 1);
-        ObjectNode groupCode =  JsonNodeFactory.instance.objectNode();
-        groupCode.put("$ne", "0");
-
-        ObjectNode projectId =  JsonNodeFactory.instance.objectNode();
-        projectId.put("$ne", "0");
-
-        ObjectNode andOr = JsonNodeFactory.instance.objectNode();
-        andOr.putPOJO("groupCode", projectId);
-        andOr.putPOJO("projectId", groupCode);
-
-        criteria.putPOJO("$andOr", andOr);
-
-        queryCriteria.setCriteria(criteria);
-        queryCriteria.setSize(-1L);
+        QueryCriteria queryCriteria = getQueryCriteria();
 
         List<ObjectTypeDefine> admDefineList = getAdmData(context, queryCriteria);
         String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
@@ -243,6 +211,28 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
         return types;
     }
 
+
+    private QueryCriteria getQueryCriteria(){
+        QueryCriteria queryCriteria = new QueryCriteria();
+        ObjectNode criteria = JsonNodeFactory.instance.objectNode();
+        criteria.put("valid", 1);
+        ObjectNode groupCode =  JsonNodeFactory.instance.objectNode();
+        groupCode.put("$ne", "0");
+
+        ObjectNode projectId =  JsonNodeFactory.instance.objectNode();
+        projectId.put("$ne", "0");
+
+        ObjectNode andOr = JsonNodeFactory.instance.objectNode();
+        andOr.putPOJO("groupCode", projectId);
+        andOr.putPOJO("projectId", groupCode);
+
+        criteria.putPOJO("$andOr", andOr);
+
+        queryCriteria.setCriteria(criteria);
+        queryCriteria.setSize(-1L);
+        return queryCriteria;
+    }
+
     /**
      * 根据map转为需要处理的对象集合
      * 使用 MigrationConstant.spliter 作为拼接符
@@ -250,7 +240,6 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
      * @param fromList
      * @return
      */
-
     public List<ObjectTypeDefine> toList(Map<String, Object> fromMap, List<ObjectTypeDefine> fromList) {
         if(CollUtil.isEmpty(fromMap) || CollUtil.isEmpty(fromList)){
             return Collections.emptyList();
@@ -300,35 +289,23 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
     /**
      * 将目标集合处理成excel格式的集合  使用与insert/delete
      *
-     * @param dataMigrationResponse
+     * @param list
      * @return
      */
     @Override
-    public List<DataMigrationExcel> processDataForExcel(DataMigrationResponse dataMigrationResponse, String type) {
-        if(CollUtil.isEmpty(dataMigrationResponse.getData()) && CollUtil.isEmpty(dataMigrationResponse.getErrorMsg())){
+    public List<DataMigrationExcel> processDataForExcel(Collection list, String type) {
+        if(CollUtil.isEmpty(list) ){
             return Collections.emptyList();
         }
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getData())){
-            for(Object obj : dataMigrationResponse.getData()){
-                if(!type.equals(MigrationType.DELETE.getCode())){
-                    ObjectTypeDefine objectTypeDefine = (ObjectTypeDefine) obj;
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(objectTypeDefine.getId());
-                    excel.setCode(objectTypeDefine.getCode());
-                    excel.setName(objectTypeDefine.getName());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }else{
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(obj.toString());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }
-            }
-        }
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            dataMigrationExcels.addAll(addErrorInfo(dataMigrationResponse.getErrorMsg()));
+        for(Object obj : list){
+            ObjectTypeDefine objectTypeDefine = (ObjectTypeDefine) obj;
+            DataMigrationExcel excel = new DataMigrationExcel();
+            excel.setId(objectTypeDefine.getId());
+            excel.setCode(objectTypeDefine.getCode());
+            excel.setName(objectTypeDefine.getName());
+            excel.setType(type);
+            dataMigrationExcels.add(excel);
         }
         return dataMigrationExcels;
     }
@@ -354,13 +331,13 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
                 syncData.setTargetId(objectTypeDefine.getId());
                 syncData.setName(objectTypeDefine.getName());
                 syncData.setCode(objectTypeDefine.getCode());
-                syncData.setObjType(objectTypeDefine.getObjType());
-                syncData.setOps(type);//操作
+                syncData.setObjectType(objectTypeDefine.getObjType());
+                syncData.setType(type);//操作
                 syncDataList.add(syncData);
             }
         }
         if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg()));
+            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg(), MigrationTable.DTDEFINETYPE.getCode()));
         }
         return syncDataList;
     }

+ 3 - 2
src/main/java/com/persagy/proxy/migration/handler/IDataMigrationProcess.java

@@ -7,6 +7,7 @@ import com.persagy.proxy.migration.model.DataMigrationExcel;
 import com.persagy.proxy.migration.model.DataMigrationResponse;
 import com.persagy.proxy.migration.model.MigrationInfo;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -35,11 +36,11 @@ public interface IDataMigrationProcess<T> {
 
     /**
      * 将目标集合处理成excel格式的集合  使用与insert/delete
-     * @param dataMigrationResponse
+     * @param list
      * @param type insert/delete
      * @return
      */
-    List<DataMigrationExcel> processDataForExcel(DataMigrationResponse dataMigrationResponse, String type);
+    List<DataMigrationExcel> processDataForExcel(Collection list, String type);
 
     /**
      * 将目标集合处理成SyncData(日志)格式的集合  入库

+ 30 - 41
src/main/java/com/persagy/proxy/migration/handler/ObjectDigitalMigration.java

@@ -60,21 +60,21 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
      */
     @Override
     public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
-        log.info("######################### dt_object 同步开始 #########################");
+        log.info("######################### dt_object 数据迁移内容获取开始 #########################");
         long start = System.currentTimeMillis();
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
 
         for(MigrationObjType objType : MigrationObjType.values()){
-            log.info("######################### dt_object "+objType.getCode()+"同步开始 #########################");
+            log.info("######################### dt_object "+objType.getCode()+"数据迁移内容获取开始 #########################");
 
             QueryCriteria queryCriteria = getQueryCriteria(objType.getCode());
             dataMigrationExcels.addAll(startMigrateForExcel(context,migrationInfo,queryCriteria));
 
-            log.info("######################### dt_object "+objType.getCode()+"同步结束 #########################");
+            log.info("######################### dt_object "+objType.getCode()+"数据迁移内容获取结束 #########################");
         }
 
         long end = System.currentTimeMillis();
-        log.info("######################### dt_object 数据迁移已结束 时间:"+(end-start)+" #########################");
+        log.info("######################### dt_object 数据迁移内容获取已结束 时间:"+(end-start)+" #########################");
         return dataMigrationExcels;
     }
 
@@ -176,10 +176,10 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
             return Collections.emptyList();
         }
 
-        String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
+        //String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
         if(CollUtil.isEmpty(objectNodeList)){
-            DataMigrationResponse dataMigrationResponse = insertBatch(admData, ObjectDigital.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            //DataMigrationResponse dataMigrationResponse = insertBatch(admData, ObjectDigital.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(admData, MigrationType.INSERT.getDesc()));
             return dataMigrationExcels;
         }
         Map<String,Object> projectMap = toEntityMap(objectNodeList, ObjectDigital.class);
@@ -188,17 +188,19 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
         Map<String,Object> doSubtractFromInsert = doSubtractAdd(admMap, projectMap);
         if(!CollUtil.isEmpty(doSubtractFromInsert)){
             List<ObjectNode> insertData = toList(doSubtractFromInsert, admData);
-            DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectDigital.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            //DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectDigital.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(insertData, MigrationType.INSERT.getDesc()));
         }
 
         //差集 删除
         Map<String,Object> doSubtractFromDelete = doSubtractDel(admMap, projectMap);
         if(!CollUtil.isEmpty(doSubtractFromDelete)){
             List<String> deleteIds = doSubtractFromDelete.entrySet().stream().map(en -> en.getKey()).collect(Collectors.toList());
-            String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
-            DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectDigital.class, delUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.DELETE.getDesc()));
+
+            List<ObjectNode> deleteData = toListByIds(deleteIds, admData);
+            //String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
+            //DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectDigital.class, delUrl);
+            dataMigrationExcels.addAll(processDataForExcel(deleteData, MigrationType.DELETE.getDesc()));
         }
 
         //交集更新
@@ -209,9 +211,9 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
             Map<String, Object> compareData = compareData(intersectionUpdateFrom, intersectionUpdateTo);
             if(CollUtil.isNotEmpty(compareData) && compareData.size() > 0){
                 List<ObjectNode> updateData = toList(compareData, admData);
-                String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
-                DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectDigital.class, updateUrl);
-                dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.UPDATE.getDesc()));
+                //String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
+                //DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectDigital.class, updateUrl);
+                dataMigrationExcels.addAll(processDataForExcel(updateData, MigrationType.UPDATE.getDesc()));
             }
         }
 
@@ -299,34 +301,22 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
     /**
      * 将目标集合处理成excel格式的集合  使用与insert/delete
      *
-     * @param dataMigrationResponse
+     * @param list
      * @return
      */
     @Override
-    public List<DataMigrationExcel> processDataForExcel(DataMigrationResponse dataMigrationResponse, String type) {
-        if(CollUtil.isEmpty(dataMigrationResponse.getData()) && CollUtil.isEmpty(dataMigrationResponse.getErrorMsg())){
+    public List<DataMigrationExcel> processDataForExcel(Collection list, String type) {
+        if(CollUtil.isEmpty(list)){
             return Collections.emptyList();
         }
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getData())){
-            for(Object obj : dataMigrationResponse.getData()){
-                if(!type.equals(MigrationType.DELETE.getCode())){
-                    ObjectDigital digital = (ObjectDigital) obj;
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(digital.getId());
-                    excel.setName(digital.getName());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }else{
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(obj.toString());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }
-            }
-        }
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            dataMigrationExcels.addAll(addErrorInfo(dataMigrationResponse.getErrorMsg()));
+        for(Object obj : list){
+            ObjectDigital digital = JsonNodeUtils.toEntity((ObjectNode) obj, ObjectDigital.class, null);
+            DataMigrationExcel excel = new DataMigrationExcel();
+            excel.setId(digital.getId());
+            excel.setName(digital.getName());
+            excel.setType(type);
+            dataMigrationExcels.add(excel);
         }
         return dataMigrationExcels;
     }
@@ -350,18 +340,17 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
                 SyncData syncData = new SyncData();
                 syncData.setTableName(MigrationTable.DTOBJECT.getCode());
                 syncData.setName(digital.getName());
-                syncData.setObjType(digital.getObjType());
-                syncData.setType(digital.getObjType());
+                syncData.setObjectType(digital.getObjType());
+                syncData.setType(type);//操作
                 syncData.setClassCode(digital.getClassCode());
                 syncData.setTargetId(digital.getId());
                 syncData.setLocalId(digital.getLocalId());
                 syncData.setLocalName(digital.getLocalName());
-                syncData.setOps(type);//操作
                 syncDataList.add(syncData);
             }
         }
         if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg()));
+            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg(), MigrationTable.DTOBJECT.getCode()));
         }
         return syncDataList;
     }

+ 30 - 42
src/main/java/com/persagy/proxy/migration/handler/ObjectRelationMigration.java

@@ -61,20 +61,20 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
      */
     @Override
     public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
-        log.info("######################### dt_relation 同步开始 #########################");
+        log.info("######################### dt_relation 数据迁移内容获取开始 #########################");
         long start = System.currentTimeMillis();
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
 
         for (MiGrationRelCode miGrationRelCode: MiGrationRelCode.values()){
-            log.info("######################### dt_relation "+miGrationRelCode.getCode()+"同步开始 #########################");
+            log.info("######################### dt_relation "+miGrationRelCode.getCode()+"数据迁移内容获取开始 #########################");
 
             QueryCriteria queryCriteria = getQueryCriteria(miGrationRelCode.getCode());
             dataMigrationExcels.addAll(startMigrateForExcel(context, migrationInfo, queryCriteria));
 
-            log.info("######################### dt_relation "+miGrationRelCode.getCode()+"同步结束 #########################");
+            log.info("######################### dt_relation "+miGrationRelCode.getCode()+"数据迁移内容获取结束 #########################");
         }
         long end = System.currentTimeMillis();
-        log.info("######################### dt_relation 同步结束 "+(end-start)+"#########################");
+        log.info("######################### dt_relation 数据迁移内容获取结束 "+(end-start)+"#########################");
         return dataMigrationExcels;
     }
 
@@ -108,14 +108,14 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
         String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
         List<ObjectRelation> projectRelations = getProjectData(queryCriteria, ObjectRelation.class, queryUrl);
         if(CollUtil.isEmpty(admRelations)){
-            log.error(" ######################### dt_relation adm已交付:"+ ResponseCode.C0320.getDesc() +" 同步结束 #########################");
+            log.error(" ######################### dt_relation adm已交付:"+ ResponseCode.C0320.getDesc() +" 数据迁移内容获取结束 #########################");
             return dataMigrationExcels;
         }
 
-        String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
+        //String insertUrl = requestUrl(context, migrationInfo, MigrationType.INSERT.getCode());
         if(CollUtil.isEmpty(projectRelations)){
-            DataMigrationResponse dataMigrationResponse = insertBatch(admRelations, ObjectRelation.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            //DataMigrationResponse dataMigrationResponse = insertBatch(admRelations, ObjectRelation.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(admRelations, MigrationType.INSERT.getDesc()));
             return dataMigrationExcels;
         }
         List<ObjectNode> objectNodeListPro = JsonNodeUtils.toListNode(projectRelations, null, null);
@@ -127,17 +127,18 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
         Map<String,Object> doSubtractFromInsert = doSubtractAdd(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(doSubtractFromInsert)){
             List<ObjectRelation> insertData = toList(doSubtractFromInsert, admRelations);
-            DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectRelation.class, insertUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.INSERT.getDesc()));
+            //DataMigrationResponse dataMigrationResponse = insertBatch(insertData, ObjectRelation.class, insertUrl);
+            dataMigrationExcels.addAll(processDataForExcel(insertData, MigrationType.INSERT.getDesc()));
         }
 
         //差集 删除
         Map<String,Object> doSubtractFromDelete = doSubtractDel(admDefineMap, projectDefineMap);
         if(!CollUtil.isEmpty(doSubtractFromDelete)){
             List<String> deleteIds = doSubtractFromDelete.entrySet().stream().map(en -> en.getKey()).collect(Collectors.toList());
-            String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
-            DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectRelation.class, delUrl);
-            dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.DELETE.getDesc()));
+            List<ObjectRelation> deleteData = toListByIds(deleteIds, projectRelations);
+//            String delUrl = requestUrl(context, migrationInfo, MigrationType.DELETE.getCode());
+//            DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectRelation.class, delUrl);
+            dataMigrationExcels.addAll(processDataForExcel(deleteData, MigrationType.DELETE.getDesc()));
         }
 
         //交集更新
@@ -148,9 +149,9 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
             Map<String, Object> compareData = compareData(intersectionUpdateFrom, intersectionUpdateTo);
             if(CollUtil.isNotEmpty(compareData) && compareData.size() > 0){
                 List<ObjectRelation> updateData = toList(compareData, admRelations);
-                String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
-                DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectRelation.class, updateUrl);
-                dataMigrationExcels.addAll(processDataForExcel(dataMigrationResponse, MigrationType.UPDATE.getDesc()));
+                //String updateUrl = requestUrl(context, migrationInfo, MigrationType.UPDATE.getCode());
+                //DataMigrationResponse dataMigrationResponse = updateBatch(updateData, ObjectRelation.class, updateUrl);
+                dataMigrationExcels.addAll(processDataForExcel(updateData, MigrationType.UPDATE.getDesc()));
             }
         }
         return dataMigrationExcels;
@@ -283,35 +284,23 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
     /**
      * 将目标集合处理成excel格式的集合  使用与insert/delete
      *
-     * @param dataMigrationResponse
+     * @param list
      * @return
      */
     @Override
-    public List<DataMigrationExcel> processDataForExcel(DataMigrationResponse dataMigrationResponse, String type) {
-        if(CollUtil.isEmpty(dataMigrationResponse.getData()) && CollUtil.isEmpty(dataMigrationResponse.getErrorMsg())){
+    public List<DataMigrationExcel> processDataForExcel(Collection list, String type) {
+        if(CollUtil.isEmpty(list)){
             return Collections.emptyList();
         }
         List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getData())){
-            for(Object obj : dataMigrationResponse.getData()){
-                if(!type.equals(MigrationType.DELETE.getCode())){
-                    ObjectRelation define = (ObjectRelation) obj;
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(define.getId());
-                    excel.setCode(define.getRelCode());
-                    excel.setCode1(define.getGraphCode());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }else{
-                    DataMigrationExcel excel = new DataMigrationExcel();
-                    excel.setId(obj.toString());
-                    excel.setType(type);
-                    dataMigrationExcels.add(excel);
-                }
-            }
-        }
-        if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            dataMigrationExcels.addAll(addErrorInfo(dataMigrationResponse.getErrorMsg()));
+        for(Object obj : list){
+            ObjectRelation define = (ObjectRelation) obj;
+            DataMigrationExcel excel = new DataMigrationExcel();
+            excel.setId(define.getId());
+            excel.setCode(define.getRelCode());
+            excel.setCode1(define.getGraphCode());
+            excel.setType(type);
+            dataMigrationExcels.add(excel);
         }
         return dataMigrationExcels;
     }
@@ -334,16 +323,15 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
                 ObjectRelation relation = (ObjectRelation) obj;
                 SyncData syncData = new SyncData();
                 syncData.setTableName(MigrationTable.DTRALATION.getCode());
-                syncData.setType(String.join(StrUtil.DASHED,relation.getRelCode(), relation.getGroupCode()));
+                syncData.setType(type);//操作
                 syncData.setTargetId(relation.getId());
                 syncData.setFromId(relation.getObjFrom());
                 syncData.setToId(relation.getObjTo());
-                syncData.setOps(type);//操作
                 syncDataList.add(syncData);
             }
         }
         if(CollUtil.isNotEmpty(dataMigrationResponse.getErrorMsg())){
-            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg()));
+            syncDataList.addAll(addErrorInfoForLog(dataMigrationResponse.getErrorMsg(),MigrationTable.DTRALATION.getCode()));
         }
         return syncDataList;
     }

+ 0 - 34
src/main/java/com/persagy/proxy/migration/service/ISyncDataService.java

@@ -1,34 +0,0 @@
-package com.persagy.proxy.migration.service;
-
-import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.rwd.migrate.entity.SyncData;
-import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
-
-import java.util.List;
-
-/**
- * @author lvxianyun
- * @title: ISyncDataService
- * @projectName adm-middleware
- * @description: 数据迁移日志
- * @date 2021/12/21 12:02
- */
-public interface ISyncDataService {
-
-    /**
-     * 查询
-     * @param context
-     * @param queryCriteria
-     * @return
-     */
-    AdmResponse doQuery(InstanceUrlParam context, QueryCriteria queryCriteria);
-
-    /**
-     * 新增
-     * @param context
-     * @param voList
-     * @return
-     */
-    List<SyncData> doInsert(InstanceUrlParam context, List<SyncData> voList);
-}

+ 11 - 7
src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java

@@ -15,6 +15,7 @@ import com.persagy.dmp.common.model.entity.AuditableEntity;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.JsonHelper;
+import com.persagy.dmp.migrate.client.DigitalMigrateLogFacade;
 import com.persagy.dmp.rwd.migrate.entity.SyncData;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
@@ -22,10 +23,8 @@ import com.persagy.proxy.migration.constant.MigrationConstant;
 import com.persagy.proxy.migration.model.DataMigrationExcel;
 import com.persagy.proxy.migration.model.DataMigrationResponse;
 import com.persagy.proxy.migration.model.MigrationInfo;
-import com.persagy.proxy.migration.service.ISyncDataService;
 import com.persagy.proxy.migration.service.MigrationAbstractService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -42,8 +41,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class MigrationAbstractServiceImpl<T> implements MigrationAbstractService<T> {
 
-    @Autowired
-    private ISyncDataService syncDataService;
     /**
      * adm交付数据(A) ∩ 现场数据(B)
      * (A∩B) A
@@ -326,13 +323,14 @@ public class MigrationAbstractServiceImpl<T> implements MigrationAbstractService
     }
 
     @Override
-    public List<SyncData> addErrorInfoForLog(List<String> errorMsg) {
-        if(CollUtil.isEmpty(errorMsg)){
+    public List<SyncData> addErrorInfoForLog(List<String> errorMsg, String tableName) {
+        if(CollUtil.isEmpty(errorMsg) || StrUtil.isEmpty(tableName)){
             return Collections.emptyList();
         }
         List<SyncData> syncDataList = new ArrayList<>(errorMsg.size());
         for(String msg : errorMsg){
             SyncData syncData = new SyncData();
+            syncData.setTableName(tableName);
             syncData.setTargetId("error");
             syncData.setError(msg);
             syncDataList.add(syncData);
@@ -345,7 +343,13 @@ public class MigrationAbstractServiceImpl<T> implements MigrationAbstractService
         if(CollUtil.isEmpty(syncDataList)){
             return Collections.emptyList();
         }
-        return syncDataService.doInsert(context, syncDataList);
+        // 调用中台新增
+        List<SyncData> syncDatas = DigitalMigrateLogFacade.create(context.getGroupCode(),context.getProjectId(),context.getAppId(), context.getUserId(), syncDataList);
+
+        if(CollUtil.isEmpty(syncDatas)) {
+            throw new RuntimeException("调用中台更新迁移日志出错");
+        }
+        return syncDataList;
     }
 
     private DataMigrationResponse processProjectData(List vos, QueryCriteria queryCriteria, Class<T> clazz, String url){

+ 0 - 70
src/main/java/com/persagy/proxy/migration/service/Impl/SyncDataServiceImpl.java

@@ -1,70 +0,0 @@
-package com.persagy.proxy.migration.service.Impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.common.model.response.CommonResult;
-import com.persagy.dmp.migrate.client.DigitalMigrateLogFacade;
-import com.persagy.dmp.rwd.migrate.entity.SyncData;
-import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
-import com.persagy.proxy.migration.service.ISyncDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author lvxianyun
- * @title: SyncDataServiceImpl
- * @projectName adm-middleware
- * @description: 数据迁移日志实现类
- * @date 2021/12/21 12:03
- */
-@Service
-public class SyncDataServiceImpl implements ISyncDataService {
-    /**
-     * 查询
-     *
-     * @param context
-     * @param queryCriteria
-     * @return
-     */
-    @Override
-    public AdmResponse doQuery(InstanceUrlParam context, QueryCriteria queryCriteria) {
-        CommonResult<List<SyncData>> dmpResult = DigitalMigrateLogFacade.query(context.getGroupCode(),context.getProjectId(),context.getAppId(), context.getUserId(), queryCriteria);
-        List<SyncData> syncDataList = dmpResult.getData();
-        // 设置返回值
-        AdmResponse response = AdmResponse.success(syncDataList);
-        Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
-        if(queryCriteria.isOnlyCount()){
-            response.setTotal(null);
-            response.setCount(total);
-        }else {
-            response.setTotal(total);
-        }
-        response.setPageNumber(queryCriteria.getPage().intValue());
-        response.setPageSize(queryCriteria.getSize().intValue());
-        return response;
-    }
-
-    /**
-     * 新增
-     *
-     * @param context
-     * @param voList
-     * @return
-     */
-    @Override
-    public List<SyncData> doInsert(InstanceUrlParam context, List<SyncData> voList) {
-        if(CollUtil.isEmpty(voList)) {
-            return Collections.emptyList();
-        }
-        // 调用中台新增
-        List<SyncData> syncDataList = DigitalMigrateLogFacade.create(context.getGroupCode(),context.getProjectId(),context.getAppId(), context.getUserId(), voList);
-
-        if(CollUtil.isEmpty(syncDataList)) {
-            throw new RuntimeException("调用中台更新迁移日志出错");
-        }
-        return syncDataList;
-    }
-}

+ 1 - 1
src/main/java/com/persagy/proxy/migration/service/MigrationAbstractService.java

@@ -94,7 +94,7 @@ public interface MigrationAbstractService<T> {
     Map<String, Object> compareData(Map<String,Object> from, Map<String,Object> to);
 
     List<DataMigrationExcel> addErrorInfo(List<String> errorMsg);
-    List<SyncData> addErrorInfoForLog(List<String> errorMsg);
+    List<SyncData> addErrorInfoForLog(List<String> errorMsg, String tableName);
     List<SyncData> addSynLog(InstanceUrlParam context, List<SyncData> syncDataList);
 
 }