Browse Source

准生产环境的交付数据,同步至客户生产环境 优化

lvxianyun 3 năm trước cách đây
mục cha
commit
d8f566d310

+ 25 - 34
src/main/java/com/persagy/proxy/migration/handler/DefineInfoMigration.java

@@ -65,24 +65,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
         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<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
         String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
         List<ObjectInfoDefine> projectDefineList = getProjectData(queryCriteria, ObjectInfoDefine.class, queryUrl);
@@ -148,24 +131,9 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
         log.info("######################### DefineInfo 同步开始 #########################");
         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");
+        QueryCriteria queryCriteria = getQueryCriteria();
 
-        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);
         List<ObjectInfoDefine> admDefineList = getAdmData(context, queryCriteria);
         String queryUrl = requestUrl(context, migrationInfo, MigrationType.QUERY.getCode());
         List<ObjectInfoDefine> projectDefineList = getProjectData(queryCriteria, ObjectInfoDefine.class, queryUrl);
@@ -348,4 +316,27 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
         }
         return syncDataList;
     }
+
+
+    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;
+    }
 }