|
@@ -61,7 +61,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
@Override
|
|
|
public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
|
|
|
log.info("######################### ObjectInfoDefine 数据迁移内容获取开始 #########################");
|
|
|
- QueryCriteria queryCriteria = getCriterionQueryCriteria();
|
|
|
+ QueryCriteria queryCriteria = getCustomQueryCriteria();
|
|
|
List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
|
|
|
String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
|
|
|
List<ObjectInfoDefine> projectDefineList = getProjectData(queryCriteria, ObjectInfoDefine.class, queryUrl);
|
|
@@ -114,7 +114,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
//处理删除的数据
|
|
|
DataMigrationResponse dataMigrationResponse = deleteBatch(deleteIds, ObjectInfoDefine.class, delUrl);
|
|
|
List<String> successIds = (List<String>) dataMigrationResponse.getData();
|
|
|
- List<ObjectInfoDefine> delObjs = toListByIds(successIds, admDefineList);
|
|
|
+ List<ObjectInfoDefine> delObjs = toListByIds(successIds, projectDefineList);
|
|
|
dataMigrationResponse.setData(delObjs);
|
|
|
syncDataList.addAll(processDataForLog(dataMigrationResponse, MigrationType.DELETE.getCode()));
|
|
|
}
|
|
@@ -173,7 +173,11 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
List<ObjectInfoDefine> results = new ArrayList<>(ids.size());
|
|
|
Map<String, ObjectInfoDefine> objectInfoDefineMap = CollUtil.fieldValueMap(fromList, BaseEntity.PROP_ID);
|
|
|
for(String key : ids){
|
|
|
- results.add(objectInfoDefineMap.get(key));
|
|
|
+ ObjectInfoDefine define = objectInfoDefineMap.get(key);
|
|
|
+ if (define!= null) {
|
|
|
+ results.add(define);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
return results;
|
|
|
}
|
|
@@ -393,7 +397,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
|
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, admDefineList);
|
|
|
+ List<ObjectInfoDefine> delData = toListByIds(deleteIds, projectDefineList);
|
|
|
dataMigrationExcels.addAll(processDataForExcel(delData, MigrationType.DELETE.getCode()));
|
|
|
}
|
|
|
|