|
@@ -1,4 +1,4 @@
|
|
|
-package com.persagy.proxy.migration.handler;
|
|
|
+package com.persagy.proxy.migration.service.Impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -19,8 +19,12 @@ import com.persagy.proxy.migration.constant.MigrationType;
|
|
|
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.IDataMigration;
|
|
|
+import com.persagy.proxy.migration.service.IDataMigrationProcess;
|
|
|
+import com.persagy.proxy.migration.service.IDefineDataMigration;
|
|
|
import com.persagy.proxy.migration.service.Impl.MigrationAbstractServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -33,23 +37,8 @@ import java.util.stream.Collectors;
|
|
|
* @date 2021/12/8 17:28
|
|
|
*/
|
|
|
@Slf4j
|
|
|
+@Service
|
|
|
public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfoDefine> implements IDataMigration, IDefineDataMigration<ObjectInfoDefine>, IDataMigrationProcess<ObjectInfoDefine> {
|
|
|
-
|
|
|
- private static DefineInfoMigration instance;
|
|
|
-
|
|
|
- private DefineInfoMigration() {}
|
|
|
-
|
|
|
- // 静态方法返回该实例
|
|
|
- public static DefineInfoMigration getInstance() {
|
|
|
- if(instance == null) {
|
|
|
- synchronized (DefineInfoMigration.class) {
|
|
|
- if (instance == null) {
|
|
|
- instance = new DefineInfoMigration();
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- return instance;
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* 数据迁移
|
|
@@ -371,10 +360,8 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
log.error(" ######################### DefineInfo adm已交付需要同步的数据:"+ ResponseCode.C0320.getDesc() +" 同步结束 #########################");
|
|
|
return dataMigrationExcels;
|
|
|
}
|
|
|
- //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(admDefineList, MigrationType.CREATE.getCode()));
|
|
|
return dataMigrationExcels;
|
|
|
}
|
|
@@ -397,8 +384,6 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
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);
|
|
|
List<ObjectInfoDefine> delData = toListByIds(deleteIds, projectDefineList);
|
|
|
dataMigrationExcels.addAll(processDataForExcel(delData, MigrationType.DELETE.getCode()));
|
|
|
}
|
|
@@ -413,8 +398,6 @@ 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());
|
|
|
- //updateBatch(updateData, ObjectInfoDefine.class, updateUrl)
|
|
|
dataMigrationExcels.addAll(processDataForExcel(updateData, MigrationType.UPDATE.getCode()));
|
|
|
}
|
|
|
}
|