111

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

@@ -1,5 +1,7 @@
 package com.dashitech.migration;
 
+import com.dashitech.migration.core.FieldMapper;
+import com.dashitech.migration.task.uc.CompanyTask;
 import com.dashitech.migration.task.uc.HospitalTask;
 import com.dashitech.migration.task.uc.XyGroupTask;
 import org.apache.commons.logging.Log;
@@ -19,15 +21,14 @@ public class StartApplication {
 
     @Autowired
     SqlTask groupTask;
-
     @Autowired
     SqlTask userTask;
-
     @Autowired
     HospitalTask hospitalTask;
-
     @Autowired
     XyGroupTask xyGroupTask;
+    @Autowired
+    CompanyTask companyTask;
 
     @Value("${application.name}")
     private String appName;
@@ -41,16 +42,13 @@ public class StartApplication {
             //工作组
             //xyGroupTask.start();
         } else {
-            //工作组
-            groupTask.start();
-        }
-
 
+            companyTask.start();
+            FieldMapper mapper = companyTask.loadCache();
 
+            System.out.println(mapper);
+        }
 
-        userTask.start();
-
-        groupTask.loadCache();
 
         log.info("########### 迁移任务完成！###########");
     }

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

@@ -25,7 +25,13 @@ public class DictionaryTask extends BaseTask {
 
     @Override
     public FieldMapper loadCache() {
-        return null;
+        FieldMapper mapper = null;
+        if ("xiangyang".equals(appName)) {
+            mapper = loadXiangYangCache();
+        } else {
+            mapper = loadNanJingCache();
+        }
+        return mapper;
     }
 
 
@@ -46,8 +52,12 @@ public class DictionaryTask extends BaseTask {
     public FieldMapper loadNanJingCache() {
         log.info(" *** 加载南京字典缓存 *** ");
         FieldMapper mapper = new FieldMapper();
-        Map<Long, Long> dicIdCache = new HashMap<>();
-        mapper.setIdCache(dicIdCache);
+        Map<Long, Long> idCache = new HashMap<>();
+        mapper.setIdCache(idCache);
+
+        //公司分类
+        idCache.put(1709L,20309L);
+        idCache.put(1710L,20311L);
 
 
         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.task.other.DictionaryTask;
 import com.dashitech.migration.util.JdbcUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,26 +25,31 @@ public class CompanyTask extends BaseTask {
 
     @Autowired
     SqlTask hospitalTask;
+    @Autowired
+    SqlTask dictionaryTask;
+
 
     @Override
     @Transactional
     public void start() {
+        log.info(" *** 三方公司CompanyTask转换开始 *** ");
+
         StringBuffer sb = new StringBuffer();
-        sb.append(" select * from itsm_uc_groups ");
+        sb.append(" select 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 ");
 
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
-        //测试
         FieldMapper mapper = new FieldMapper();
-        mapper.addOperationRemove("id").addOperationRemove("duty_id");
-        mapper.addOperationUpdate("_hospital_id", "branch_id");
-        mapper.addOperationAdd("type", 3);
+        mapper.addOperationAdd("busi_type", 20312L); //公司业务类型-医废
         Map<Long, Long> hosIdCache = hospitalTask.loadCache().getIdCache();
-        mapper.addOperationReplace("branch_id", hosIdCache);
+        mapper.addOperationReplace("hos_id", hosIdCache);
+        mapper.addOperationReplace("company_type_ids", dictionaryTask.loadCache().getIdCache());
         mapper.trans2JdbcRow(list);
 
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
-        jdbcUtil.batchPageInsert("itsm_uc_groups", mapper.getRows());
+        jdbcUtil.batchPageInsert("itsm_uc_company", mapper.getRows());
 
         //clear释放内存
         mapper.clear();
@@ -51,10 +57,19 @@ public class CompanyTask extends BaseTask {
 
     @Override
     public FieldMapper loadCache() {
-        log.info(" *** 加载请求人Requesterl缓存 *** ");
+        log.info(" *** 加载三方公司CompanyTask缓存 *** ");
 
+        String sql = " select id,name,delete_flag from itsm_uc_company ";
+        List<Map<String, Object>> list = jdbcTemplateHsms.queryForList(sql);
+        sql = " select id,name,delete_flag from itsm_uc_company ";
+        List<Map<String, Object>> list2 = jdbcTemplateMdv2.queryForList(sql);
+
+        FieldMapper mapper = new FieldMapper();
+        mapper.addFieldMapper("name", "name");
+        mapper.addFieldMapper("delete_flag", "delete_flag");
 
+        DataMigrationter.loadCache(list, list2, mapper);
 
-        return null;
+        return mapper;
     }
 }

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

@@ -41,7 +41,12 @@ public class HospitalTask extends BaseTask {
     public FieldMapper loadCache() {
         log.info(" *** 加载院区Hospital缓存 *** ");
 
-        FieldMapper mapper = loadNanjingCache();
+        FieldMapper mapper = null;
+        if ("xiangyang".equals(appName)) {
+            mapper = loadXiangyangCache();
+        } else {
+            mapper = loadNanjingCache();
+        }
 
         return mapper;
     }

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

@@ -38,13 +38,8 @@ public class UserTask extends BaseTask {
         List list = jdbcTemplateHsms.queryForList(sb.toString());
 
         FieldMapper groupMapper = groupTask.loadCache();
-        Map<Long, Long> hosIdCache = null;
-        if ("xiangyang".equals(appName)) {
-            hosIdCache = hospitalTask.loadXiangyangCache().getIdCache();
-        } else {
-            hosIdCache = hospitalTask.loadNanjingCache().getIdCache();
-        }
-        System.out.println(groupMapper.getIdCache());
+        Map<Long, Long> hosIdCache = hospitalTask.loadXiangyangCache().getIdCache();
+        System.out.println(hosIdCache);
 
 
     }