增加了修改对比功能

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

@@ -43,10 +43,11 @@ public class StartApplication {
             //xyGroupTask.start();
         } else {
 
-            companyTask.start();
-            FieldMapper mapper = companyTask.loadCache();
+//            companyTask.start();
 
-            System.out.println(mapper);
+            userTask.start();
+
+            System.out.println("AAAAA");
         }
 
 

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

@@ -1,5 +1,6 @@
 package com.dashitech.migration.core;
 
+import com.dashitech.migration.util.JdbcRow;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -15,6 +16,40 @@ public class DataMigrationter {
     public static Log log = LogFactory.getLog(DataMigrationter.class);
 
     /**
+     * 根据loadCache的数据，区分是新增，还是修改
+     */
+    public static RowsWrap getRowsWrap(FieldMapper dataMapper,FieldMapper cacheMapper) {
+        RowsWrap rw = new RowsWrap();
+        List<JdbcRow> rows = dataMapper.getRows();
+        Map<String, Long> targetCache = cacheMapper.getTargetCache();
+        if(rows.size() > 0) {
+            for (JdbcRow jdbcRow : rows) {
+                Map<String, Object> row = jdbcRow.getRow();
+
+                //拼接联合主键，判断是更新，还是新增
+                StringBuffer key = new StringBuffer();
+                for (DataMapper fieldMapper : cacheMapper.getFieldList()) {
+                    Object value = row.get(fieldMapper.getSourceName());
+                    //可能构建联合主键时，需要替换成新数据
+                    value = getOprationReplaceValue(dataMapper, fieldMapper, value);
+                    key.append(value).append("_");
+                }
+                key.deleteCharAt(key.length() - 1);
+
+                //如果不存在是新增，如果存在，是修改
+                Object value = targetCache.get(key.toString());
+                if(value == null) {
+                    rw.addInsertRow(jdbcRow);
+                }else {
+                    jdbcRow.setWhere("id", Long.valueOf(value.toString()));
+                    rw.addUpdateRow(jdbcRow);
+                }
+            }
+        }
+        return rw;
+    }
+
+    /**
      * 开始匹配数据,并缓存到mapper的idCache里面
      */
     public static void loadCache(List<Map<String, Object>> targetList, List<Map<String, Object>> sourceList, FieldMapper mapper) {

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

@@ -69,6 +69,8 @@ public class FieldMapper {
                     }
                 }
 
+                //判重复
+
                 JdbcRow jdbcRow = row2JdbcRow(row);
                 rows.add(jdbcRow);
             }

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

@@ -0,0 +1,41 @@
+package com.dashitech.migration.core;
+
+import com.dashitech.migration.util.JdbcRow;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ */
+public class RowsWrap {
+
+    private List<JdbcRow> insertRows = new ArrayList<>();
+    private List<JdbcRow> updateRows = new ArrayList<>();
+
+    public void addInsertRow(JdbcRow row) {
+        insertRows.add(row);
+    }
+
+    public void addUpdateRow(JdbcRow row) {
+        updateRows.add(row);
+    }
+
+    public List<JdbcRow> getInsertRows() {
+        return insertRows;
+    }
+
+    public void setInsertRows(List<JdbcRow> insertRows) {
+        this.insertRows = insertRows;
+    }
+
+    public List<JdbcRow> getUpdateRows() {
+        return updateRows;
+    }
+
+    public void setUpdateRows(List<JdbcRow> updateRows) {
+        this.updateRows = updateRows;
+    }
+}

src/main/java/com/dashitech/migration/task/other/DictionaryTask.java

@@ -58,6 +58,8 @@ public class DictionaryTask extends BaseTask {
         //公司分类
         idCache.put(1709L,20309L);
         idCache.put(1710L,20311L);
+        idCache.put(279L,1609L);
+        idCache.put(280L,1610L);
 
 
         return mapper;

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

@@ -4,6 +4,7 @@ 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.core.RowsWrap;
 import com.dashitech.migration.task.other.DictionaryTask;
 import com.dashitech.migration.util.JdbcUtil;
 import org.apache.commons.logging.Log;
@@ -29,13 +30,14 @@ public class CompanyTask extends BaseTask {
     SqlTask dictionaryTask;
 
 
+
     @Override
     @Transactional
     public void start() {
         log.info(" *** 三方公司CompanyTask转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
-        sb.append(" select name,contacts,mphone,service_type_ids as 'company_type_ids', ");
+        sb.append(" select version,name,contacts,mphone,service_type_ids as 'company_type_ids', ");
         sb.append(" delete_flag,add_time,branch_id as 'hos_id' ");
         sb.append(" from itsm_uc_company ");
 

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

@@ -0,0 +1,66 @@
+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.core.RowsWrap;
+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.List;
+import java.util.Map;
+
+/**
+ * Created by CX on 2024/10/10.
+ */
+@Component
+public class UserGroupTask extends BaseTask {
+
+    @Autowired
+    SqlTask groupTask;
+
+    @Autowired
+    SqlTask userTask;
+
+    public static Log log = LogFactory.getLog(UserGroupTask.class);
+
+    @Override
+    @Transactional
+    public void start() {
+        log.info(" *** 用户user转换开始 *** ");
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(" select * from itsm_uc_user ");
+
+        List list = jdbcTemplateHsms.queryForList(sb.toString());
+
+        FieldMapper mapper = new FieldMapper();
+
+        FieldMapper groupMapper = groupTask.loadCache();
+        mapper.addOperationReplace("branch_id", userTask.loadCache().getIdCache());
+
+        FieldMapper userMapper = loadCache();
+        RowsWrap rw = DataMigrationter.getRowsWrap(mapper,userMapper);
+        JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
+        jdbcUtil.batchPageInsert("itsm_uc_user", rw.getInsertRows());
+        jdbcUtil.batchPageUpdate("itsm_uc_user", rw.getUpdateRows());
+
+        //clear释放内存
+        mapper.clear();
+        groupMapper.clear();
+        userMapper.clear();
+    }
+
+    @Override
+    public FieldMapper loadCache() {
+
+
+
+        return null;
+    }
+}

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

@@ -4,6 +4,8 @@ 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.core.RowsWrap;
+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;
@@ -20,10 +22,7 @@ import java.util.Map;
 public class UserTask extends BaseTask {
 
     @Autowired
-    SqlTask groupTask;
-
-    @Autowired
-    HospitalTask hospitalTask;
+    SqlTask hospitalTask;
 
     public static Log log = LogFactory.getLog(UserTask.class);
 
@@ -33,24 +32,37 @@ public class UserTask extends BaseTask {
         log.info(" *** 用户user转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
-        sb.append(" select * from itsm_uc_user ");
-
-        List list = jdbcTemplateHsms.queryForList(sb.toString());
-
-        FieldMapper groupMapper = groupTask.loadCache();
-        Map<Long, Long> hosIdCache = hospitalTask.loadXiangyangCache().getIdCache();
-        System.out.println(hosIdCache);
+        sb.append(" select version,ACCOUNT,GENDER,NAME,PHONE,PWD,WEIXIN,DEPTID,delete_flag ");
+        sb.append(" pinyin,py as 'input_code',online,branch_id as 'hospital_id', ");
+        sb.append(" duty_id as 'duty_dept',company as 'company_id',engineer ");
+        sb.append(" from itsm_uc_user ");
 
+        List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
+        FieldMapper mapper = new FieldMapper();
+        mapper.addOperationAdd("usertype", 20343L); //用户类型-默认三方人员
+        mapper.addOperationReplace("hospital_id", hospitalTask.loadCache().getIdCache());
+        mapper.addOperationReplace("duty_dept", hospitalTask.loadCache().getIdCache());
+        mapper.trans2JdbcRow(list);
+
+        FieldMapper userMapper = loadCache();
+        RowsWrap rw = DataMigrationter.getRowsWrap(mapper,userMapper);
+        JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
+        jdbcUtil.batchPageInsert("itsm_uc_user", rw.getInsertRows());
+        jdbcUtil.batchPageUpdate("itsm_uc_user", rw.getUpdateRows());
+
+        //clear释放内存
+        mapper.clear();
+        userMapper.clear();
     }
 
     @Override
     public FieldMapper loadCache() {
         log.info(" *** 加载用户user缓存 *** ");
 
-        String sql = " select id,ACCOUNT,delete_flag from itsm_uc_groups ";
+        String sql = " select id,ACCOUNT,delete_flag from itsm_uc_user ";
         List<Map<String, Object>> list = jdbcTemplateHsms.queryForList(sql);
-        sql = " select id,ACCOUNT,delete_flag from itsm_uc_groups ";
+        sql = " select id,ACCOUNT,delete_flag from itsm_uc_user ";
         List<Map<String, Object>> list2 = jdbcTemplateMdv2.queryForList(sql);
 
         FieldMapper mapper = new FieldMapper();

src/main/resources/application.properties

@@ -47,12 +47,12 @@ spring.redis.pool.max-wait-millis=10000
 spring.profiles.active=custom
 spring.redis.topic=hsms-data-service
 
-server.port=29999
+server.port=39999
 spring.jps.showsql=true
 server.tomcat.compression=on
 
 spring.jackson.parser.allow-numeric-leading-zeros=true
 
 #\u5F53\u524D\u73AF\u5883\u540D\u79F0
-application.name=xiangyang
+application.name=nanjing