|
@@ -61,7 +61,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
@Override
|
|
@Override
|
|
public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
|
|
public List<DataMigrationExcel> migrateForExcel(InstanceUrlParam context, MigrationInfo migrationInfo) {
|
|
log.info("######################### ObjectInfoDefine 数据迁移内容获取开始 #########################");
|
|
log.info("######################### ObjectInfoDefine 数据迁移内容获取开始 #########################");
|
|
- QueryCriteria queryCriteria = getCustomQueryCriteria();
|
|
|
|
|
|
+ QueryCriteria queryCriteria = getCustomQueryCriteria(context);
|
|
List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
|
|
List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
|
|
String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
|
|
String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
|
|
List<ObjectInfoDefine> projectDefineList = getProjectData(queryCriteria, ObjectInfoDefine.class, queryUrl);
|
|
List<ObjectInfoDefine> projectDefineList = getProjectData(queryCriteria, ObjectInfoDefine.class, queryUrl);
|
|
@@ -76,7 +76,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
long start = System.currentTimeMillis();
|
|
long start = System.currentTimeMillis();
|
|
List<SyncData> syncDataList = new ArrayList<>();
|
|
List<SyncData> syncDataList = new ArrayList<>();
|
|
|
|
|
|
- QueryCriteria queryCriteria = getCustomQueryCriteria();
|
|
|
|
|
|
+ QueryCriteria queryCriteria = getCustomQueryCriteria(context);
|
|
|
|
|
|
List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
|
|
List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
|
|
String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
|
|
String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
|
|
@@ -229,7 +229,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
excel.setName(define.getName());
|
|
excel.setName(define.getName());
|
|
excel.setType(type);
|
|
excel.setType(type);
|
|
excel.setCreateTime(define.getCreationTime().toString());
|
|
excel.setCreateTime(define.getCreationTime().toString());
|
|
- excel.setUpdateTime(define.getModifiedTime().toString());
|
|
|
|
|
|
+ excel.setUpdateTime(define.getModifiedTime() == null ? define.getCreationTime().toString() : define.getModifiedTime().toString());
|
|
dataMigrationExcels.add(excel);
|
|
dataMigrationExcels.add(excel);
|
|
}
|
|
}
|
|
return dataMigrationExcels;
|
|
return dataMigrationExcels;
|
|
@@ -343,8 +343,8 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
public List<DataMigrationExcel> compareCriterionByData(InstanceUrlParam context, MigrationInfo migrationInfo, long totalCount) {
|
|
public List<DataMigrationExcel> compareCriterionByData(InstanceUrlParam context, MigrationInfo migrationInfo, long totalCount) {
|
|
log.info("######################### ObjectInfoDefine 数据迁移 标准字典验证 开始 #########################");
|
|
log.info("######################### ObjectInfoDefine 数据迁移 标准字典验证 开始 #########################");
|
|
QueryCriteria queryCriteria = getCriterionQueryCriteria();
|
|
QueryCriteria queryCriteria = getCriterionQueryCriteria();
|
|
- queryCriteria.setSize(10000l);
|
|
|
|
- long pages = 1l;
|
|
|
|
|
|
+ queryCriteria.setSize(10000L);
|
|
|
|
+ long pages = 1L;
|
|
if(totalCount > 10000){
|
|
if(totalCount > 10000){
|
|
pages = totalCount / 10000 + 1;
|
|
pages = totalCount / 10000 + 1;
|
|
}
|
|
}
|
|
@@ -427,19 +427,14 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
* 项目级、集团级定义
|
|
* 项目级、集团级定义
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- private QueryCriteria getCustomQueryCriteria(){
|
|
|
|
|
|
+ private QueryCriteria getCustomQueryCriteria(InstanceUrlParam context){
|
|
QueryCriteria queryCriteria = new QueryCriteria();
|
|
QueryCriteria queryCriteria = new QueryCriteria();
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
criteria.put("valid", 1);
|
|
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();
|
|
ObjectNode andOr = JsonNodeFactory.instance.objectNode();
|
|
- andOr.putPOJO("groupCode", projectId);
|
|
|
|
- andOr.putPOJO("projectId", groupCode);
|
|
|
|
|
|
+ andOr.put("groupCode", context.getGroupCode());
|
|
|
|
+ andOr.put("projectId", context.getProjectId());
|
|
|
|
|
|
criteria.putPOJO("$andOr", andOr);
|
|
criteria.putPOJO("$andOr", andOr);
|
|
|
|
|
|
@@ -457,8 +452,8 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
QueryCriteria queryCriteria = new QueryCriteria();
|
|
QueryCriteria queryCriteria = new QueryCriteria();
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
criteria.put("valid", 1);
|
|
criteria.put("valid", 1);
|
|
- criteria.put("groupCode", 0);
|
|
|
|
- criteria.put("projectId", 0);
|
|
|
|
|
|
+ criteria.put("groupCode", "0");
|
|
|
|
+ criteria.put("projectId", "0");
|
|
queryCriteria.setCriteria(criteria);
|
|
queryCriteria.setCriteria(criteria);
|
|
queryCriteria.setSize(-1L);
|
|
queryCriteria.setSize(-1L);
|
|
return queryCriteria;
|
|
return queryCriteria;
|