Browse Source

adm 数据迁移 fix bug

lvxianyun 3 years ago
parent
commit
43255a823f

+ 0 - 5
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/constant/MigrationConstant.java

@@ -18,11 +18,6 @@ public class MigrationConstant {
     /** 数据拼接 用于map的key和value拼接成一个串 **/
     public final static String SPLITER_UNION = "@@";
 
-    /**   日志 接口 ***/
-    public final static String DT_LOG = "/dmp-rwd/rwd/log/migrate?";
-    public final static String DT_LOG_INSERT = "/dmp-rwd/rwd/log/migrate/create?";
-
-
     /**   对象类型定义 接口 ***/
     public final static String DEF_CLASS = "/dmp-rwd/rwd/def/class?";
     public final static String DEF_CLASS_INSERT = "/dmp-rwd/rwd/def/class/createBatch?";

+ 2 - 3
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/handler/DataMigrationHandler.java

@@ -19,7 +19,6 @@ import java.util.*;
  * @date 2021/12/3 11:14
  */
 @Component
-
 public class DataMigrationHandler {
 
     private static Map<String, IDataMigration> migrationMap = new HashMap<>(16);
@@ -31,7 +30,7 @@ public class DataMigrationHandler {
      */
     public Map<String, List<DataMigrationExcel>> handleDicData(InstanceUrlParam context, MigrationInfo migrationInfo){
         Map<String,List<DataMigrationExcel>> results = new HashMap<>(2);
-       /* AdmResponse admResponseType = DefineTypeMigration.getInstance().compareByCount(context, migrationInfo);
+        AdmResponse admResponseType = DefineTypeMigration.getInstance().compareByCount(context, migrationInfo);
 
         if(!admResponseType.getResult().equals(DmpResult.SUCCESS)){
             List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
@@ -43,7 +42,7 @@ public class DataMigrationHandler {
             List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
             dataMigrationExcels.addAll((Collection<? extends DataMigrationExcel>) admResponseInfo.getContent());
             results.put(MigrationTable.DTDEFINEINFO.getCode(), dataMigrationExcels);
-        }*/
+        }
         return results;
     }
 

+ 1 - 4
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java

@@ -275,10 +275,7 @@ public class MigrationAbstractServiceImpl<T> implements MigrationAbstractService
     private DataMigrationResponse saveOrUpdateCommProcess(List vos,  Class<T> clazz, String url){
         DataMigrationResponse dataMigrationResponse = DataMigrationResponse.success();
         if(vos.size() <= MigrationConstant.BATCH_SUBMIT_DATA_COUNT){
-            DataMigrationResponse temp = processProjectData(vos,null, clazz, url);
-            if(CollUtil.isNotEmpty(temp.getData())){
-                dataMigrationResponse.addData(temp.getData());
-            }
+            dataMigrationResponse = processProjectData(vos,null, clazz, url);
         }else{
             int count= vos.size() / MigrationConstant.BATCH_SUBMIT_DATA_COUNT;
             for(int k = 0; k< count + 1 ;k++){