完善工具

src/main/java/com/dashitech/migration/SqlTask.java

@@ -8,9 +8,9 @@ import com.dashitech.migration.core.FieldMapper;
 public interface SqlTask {
 
     /**
-     * 不需要try/catch，有错就抛出来处理
+     * 不需要try/catch，有错就抛出来处理。一个start只能单独执行，如果嵌套到别的方法内，事务可能不会正常执行
      */
-    FieldMapper start(FieldMapper fieldMapper);
+    void start();
 
     /**
      * 如果之前执行有报错，需要重新加载特定字段缓存数据

src/main/java/com/dashitech/migration/StartApplication.java

@@ -1,6 +1,5 @@
 package com.dashitech.migration;
 
-import com.dashitech.migration.core.FieldMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,12 +17,20 @@ public class StartApplication {
     @Autowired
     SqlTask groupTask;
 
+    @Autowired
+    SqlTask userTask;
+
     public void start() {
+        log.info("########### 开始迁移任务！###########");
+
         //工作组
-        FieldMapper groupMapper = groupTask.start(null);
-//        FieldMapper groupMapper = groupTask.loadCache();
-        System.out.println(groupMapper);
+        groupTask.start();
+
+//        userTask.start();
+
+//        groupTask.loadCache();
 
+        log.info("########### 迁移任务完成！###########");
     }
 
 

src/main/java/com/dashitech/migration/core/DataMapper.java

@@ -9,16 +9,22 @@ import java.util.Map;
  */
 public class DataMapper implements Serializable{
 
+    //目标
     private String targetName;
     private Object targetValue;
     private Long targetId;
+
+    //源
     private String sourceName;
     private Object sourceValue;
     private Long sourceId;
+
+    //操作类型
     private boolean remove = false;
     private boolean update = false;
     private boolean add = false;
     private boolean replace = false;
+
     /**
      * 匹配完成后的id对照，source:target
      */

src/main/java/com/dashitech/migration/core/DataMigrationter.java

@@ -14,6 +14,9 @@ import java.util.Map;
 public class DataMigrationter {
     public static Log log = LogFactory.getLog(DataMigrationter.class);
 
+    /**
+     * 开始匹配数据,并缓存到mapper的idCache里面
+     */
     public static void loadCache(List<Map<String, Object>> targetList, List<Map<String, Object>> sourceList, FieldMapper mapper) {
         mapperData(targetList, sourceList, mapper);
         trans2IdCache(mapper);
@@ -51,7 +54,7 @@ public class DataMigrationter {
             Long targetId = entry.getValue();
             if (sourceId != null && targetId != null) {
                 cache.put(sourceId, targetId);
-            }else if(sourceId != null){
+            } else if (sourceId != null) {
                 cache.put(sourceId, null);
             }
         }
@@ -59,17 +62,25 @@ public class DataMigrationter {
     }
 
 
+    /**
+     * 设置源数据，联合主键
+     */
     public static void setSourceKey(Map<String, Object> map, FieldMapper mapper) {
         StringBuffer source = new StringBuffer();
         Object id = map.get("id");
         for (DataMapper dataMapper : mapper.getFieldList()) {
             Object value = map.get(dataMapper.getSourceName());
+            //可能构建联合主键时，需要替换成新数据
+            value = getOprationReplaceValue(mapper, dataMapper, value);
             source.append(value).append("_");
         }
         source.deleteCharAt(source.length() - 1);
         mapper.getSourceCache().put(source.toString(), id == null ? null : Long.valueOf(id.toString()));
     }
 
+    /**
+     * 设置目标数据，联合主键
+     */
     public static void setTargetKey(Map<String, Object> map, FieldMapper mapper) {
         StringBuffer target = new StringBuffer();
         Object id = map.get("id");
@@ -81,4 +92,18 @@ public class DataMigrationter {
         mapper.getTargetCache().put(target.toString(), id == null ? null : Long.valueOf(id.toString()));
     }
 
+    /**
+     * 构建联合主键时，替换成新数据
+     */
+    private static Object getOprationReplaceValue(FieldMapper mapper, DataMapper dataMapper, Object value) {
+        for (DataMapper opMapper : mapper.getRowsOperationList()) {
+            //如果是要替换的，使用id缓存替换。
+            if (opMapper.isReplace() && opMapper.getSourceName().equals(dataMapper.getSourceName()) && value != null) {
+                Long valueId = opMapper.getIdCache().get(value);
+                return valueId;
+            }
+        }
+        return value;
+    }
+
 }

src/main/java/com/dashitech/migration/core/FieldMapper.java

@@ -55,16 +55,16 @@ public class FieldMapper {
                     }
                     //如果是新增，直接put
                     if (dataMapper.isAdd()) {
-                        row.put(dataMapper.getSourceName(),dataMapper.getTargetValue());
+                        row.put(dataMapper.getSourceName(), dataMapper.getTargetValue());
                     }
                     //如果是要替换的，使用id缓存替换
                     if (dataMapper.isReplace() && row.containsKey(dataMapper.getSourceName())) {
                         Object value = row.get(dataMapper.getSourceName());
-                        if(value != null) {
+                        if (value != null) {
                             Long id = dataMapper.getIdCache().get(value);
-                            row.put(dataMapper.getSourceName(),id);
-                        }else {
-                            row.put(dataMapper.getSourceName(),null);
+                            row.put(dataMapper.getSourceName(), id);
+                        } else { //没有拿到数据，就置空
+                            row.put(dataMapper.getSourceName(), null);
                         }
                     }
                 }
@@ -122,14 +122,14 @@ public class FieldMapper {
     }
 
     /**
-     * 待替换的字段。注意：name是旧source名称，不是新target名称，每次加入都在队列最前面
+     * 待替换的字段，每次加入都在队列最前面。注意：如果是loadCache过滤，使用target名称，如果是start转换，使用source名称
      */
     public FieldMapper addOperationReplace(String name, Map<Long, Long> idCache) {
         DataMapper mapper = new DataMapper(name, name);
         mapper.setReplace(true);
         mapper.setIdCache(idCache);
         //TODO 替换，必须放在第一个，避免被修改字段名称后，导致使用新名称的错误
-        rowsOperationList.add(0,mapper);
+        rowsOperationList.add(0, mapper);
         return this;
     }
 
@@ -142,6 +142,7 @@ public class FieldMapper {
         this.targetCache.clear();
         this.idCache.clear();
         this.rows.clear();
+        this.rowsOperationList.clear();
     }
 
     public List<DataMapper> getFieldList() {

src/main/java/com/dashitech/migration/task/uc/GroupTask.java

@@ -1,15 +1,16 @@
 package com.dashitech.migration.task.uc;
 
 import com.dashitech.migration.BaseTask;
+import com.dashitech.migration.SqlTask;
 import com.dashitech.migration.core.DataMigrationter;
 import com.dashitech.migration.core.FieldMapper;
 import com.dashitech.migration.util.JdbcUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,9 +22,12 @@ public class GroupTask extends BaseTask {
 
     public static Log log = LogFactory.getLog(GroupTask.class);
 
+    @Autowired
+    SqlTask hospitalTask;
+
     @Override
     @Transactional
-    public FieldMapper start(FieldMapper fieldMapper) {
+    public void start() {
         log.info(" *** 工作组group转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
@@ -36,34 +40,32 @@ public class GroupTask extends BaseTask {
         mapper.addOperationRemove("id").addOperationRemove("duty_id");
         mapper.addOperationUpdate("_hospital_id", "branch_id");
         mapper.addOperationAdd("type", 3);
-        Map<Long, Long> hosIdCache = new HashMap<>();
-        hosIdCache.put(1L, 4L);
+        Map<Long, Long> hosIdCache = hospitalTask.loadCache().getIdCache();
         mapper.addOperationReplace("branch_id", hosIdCache);
         mapper.trans2JdbcRow(list);
 
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
         jdbcUtil.batchPageInsert("itsm_uc_groups", mapper.getRows());
 
-        //不需要缓存id的话，clear释放内存
+        //clear释放内存
         mapper.clear();
-
-        mapper = loadCache();
-
-        return mapper;
     }
 
     @Override
     public FieldMapper loadCache() {
         log.info(" *** 加载工作组group缓存 *** ");
 
-        String sql = " select id,groupname,delete_flag from itsm_uc_groups ";
+        String sql = " select id,groupname,delete_flag,_hospital_id from itsm_uc_groups ";
         List<Map<String, Object>> list = jdbcTemplateHsms.queryForList(sql);
-        sql = " select id,groupname,delete_flag from itsm_uc_groups ";
+        sql = " select id,groupname,delete_flag,branch_id from itsm_uc_groups ";
         List<Map<String, Object>> list2 = jdbcTemplateMdv2.queryForList(sql);
 
         FieldMapper mapper = new FieldMapper();
         mapper.addFieldMapper("groupname", "groupname");
         mapper.addFieldMapper("delete_flag", "delete_flag");
+        mapper.addFieldMapper("_hospital_id", "branch_id");
+        Map<Long, Long> hosIdCache = hospitalTask.loadCache().getIdCache();
+        mapper.addOperationReplace("branch_id", hosIdCache);
 
         DataMigrationter.loadCache(list, list2, mapper);
 

src/main/java/com/dashitech/migration/task/uc/HospitalTask.java

@@ -0,0 +1,46 @@
+package com.dashitech.migration.task.uc;
+
+import com.dashitech.migration.BaseTask;
+import com.dashitech.migration.SqlTask;
+import com.dashitech.migration.core.FieldMapper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by CX on 2024/10/10.
+ */
+@Component
+public class HospitalTask extends BaseTask {
+
+    public static Log log = LogFactory.getLog(HospitalTask.class);
+
+    @Override
+    @Transactional
+    public void start() {
+
+    }
+
+    @Override
+    public FieldMapper loadCache() {
+        log.info(" *** 加载院区Hospital缓存 *** ");
+
+        FieldMapper mapper = new FieldMapper();
+        Map<Long, Long> hosIdCache = new HashMap<>();
+        mapper.setIdCache(hosIdCache);
+
+        hosIdCache.put(1L, 4L); //总务科
+        hosIdCache.put(2L, 4L); //总务科
+        hosIdCache.put(3L, 5L); //信息科
+        hosIdCache.put(4L, 6L); //设备科
+
+
+        return mapper;
+    }
+}

src/main/java/com/dashitech/migration/task/uc/UserTask.java

@@ -1,15 +1,15 @@
 package com.dashitech.migration.task.uc;
 
 import com.dashitech.migration.BaseTask;
-import com.dashitech.migration.core.DataMigrationter;
+import com.dashitech.migration.SqlTask;
 import com.dashitech.migration.core.FieldMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by CX on 2024/10/10.
@@ -17,11 +17,14 @@ import java.util.Map;
 @Component
 public class UserTask extends BaseTask {
 
+    @Autowired
+    SqlTask groupTask;
+
     public static Log log = LogFactory.getLog(UserTask.class);
 
     @Override
     @Transactional
-    public FieldMapper start(FieldMapper fieldMapper) {
+    public void start() {
         log.info(" *** 用户user转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
@@ -29,8 +32,10 @@ public class UserTask extends BaseTask {
 
         List list = jdbcTemplateHsms.queryForList(sb.toString());
 
+        FieldMapper groupMapper = groupTask.loadCache();
+        System.out.println(groupMapper.getIdCache());
+
 
-        return fieldMapper;
     }
 
     @Override

src/main/resources/start.bat

@@ -1,5 +1,5 @@
 echo "start ing"
 
-java -Xmx512m -XX:MaxPermSize=256m -jar C:/Users/Administrator/Desktop/hsmsV1-DataService-1.0.0.jar --server.port=29999 &
+java -Xmx512m -XX:MaxPermSize=256m -jar C:/Users/Administrator/Desktop/hsmsV1-DataMigration-1.0.0.jar --server.port=29999 &
 
 echo "start end"