增加字典id查询

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

@@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -13,8 +13,6 @@ import java.util.Map;
  */
 public abstract class BaseTask implements SqlTask {
 
-    protected Map cache = new LinkedHashMap();
-
     @Value("${application.name}")
     protected String appName;
 
@@ -26,5 +24,16 @@ public abstract class BaseTask implements SqlTask {
     @Qualifier("jdbcTemplateMdv2")
     protected JdbcTemplate jdbcTemplateMdv2;
 
+    /**
+     * 获取字典id
+     */
+    public Long getDicId(JdbcTemplate jt,String key, String value) {
+        List<Map<String,Object>> list = jt.queryForList("SELECT id from itsm_base_dictionary WHERE _key = ? and _value = ?",key,value);
+        if(list != null && list.size() > 0) {
+            Object obj = list.get(0).get("id");
+            return obj == null ? null : Long.valueOf(obj.toString());
+        }
+        return null;
+    }
 
 }

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

@@ -24,6 +24,8 @@ public class StartApplication {
     @Autowired
     SqlTask userTask;
     @Autowired
+    SqlTask userGroupTask;
+    @Autowired
     HospitalTask hospitalTask;
     @Autowired
     XyGroupTask xyGroupTask;
@@ -45,7 +47,11 @@ public class StartApplication {
 
 //            companyTask.start();
 
-            userTask.start();
+//            userTask.start();
+
+//            userGroupTask.start();
+
+            userTask.loadCache();
 
             System.out.println("AAAAA");
         }

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

@@ -44,7 +44,7 @@ public class CompanyTask extends BaseTask {
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
         FieldMapper mapper = new FieldMapper();
-        mapper.addOperationAdd("busi_type", 20312L); //公司业务类型-医废
+        mapper.addOperationAdd("busi_type", getDicId(jdbcTemplateHsms,"company_busi_type","1")); //公司业务类型-医废
         Map<Long, Long> hosIdCache = hospitalTask.loadCache().getIdCache();
         mapper.addOperationReplace("hos_id", hosIdCache);
         mapper.addOperationReplace("company_type_ids", dictionaryTask.loadCache().getIdCache());

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

@@ -32,23 +32,26 @@ public class UserGroupTask extends BaseTask {
     @Override
     @Transactional
     public void start() {
-        log.info(" *** 用户user转换开始 *** ");
+        log.info(" *** UserGroupTask 转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
-        sb.append(" select * from itsm_uc_user ");
+        //只拿运维人员
+        sb.append(" select group_id,user_id from itsm_uc_user_group ");
 
-        List list = jdbcTemplateHsms.queryForList(sb.toString());
+        List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
         FieldMapper mapper = new FieldMapper();
-
         FieldMapper groupMapper = groupTask.loadCache();
-        mapper.addOperationReplace("branch_id", userTask.loadCache().getIdCache());
+        FieldMapper userMapper = userTask.loadCache();
+
+        mapper.addOperationReplace("group_id", groupMapper.getIdCache());
+        mapper.addOperationReplace("user_id", userMapper.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());
+        jdbcUtil.batchPageInsert("itsm_uc_user_group", mapper.getRows());
 
         //clear释放内存
         mapper.clear();
@@ -60,7 +63,6 @@ public class UserGroupTask extends BaseTask {
     public FieldMapper loadCache() {
 
 
-
         return null;
     }
 }

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

@@ -32,15 +32,16 @@ public class UserTask extends BaseTask {
         log.info(" *** 用户user转换开始 *** ");
 
         StringBuffer sb = new StringBuffer();
-        sb.append(" select version,ACCOUNT,GENDER,NAME,PHONE,PWD,WEIXIN,DEPTID,delete_flag ");
+        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 ");
+        sb.append(" where ACCOUNT != 'dsadmin' ");
 
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
         FieldMapper mapper = new FieldMapper();
-        mapper.addOperationAdd("usertype", 20343L); //用户类型-默认三方人员
+        mapper.addOperationAdd("usertype", getDicId(jdbcTemplateHsms,"usertype","4")); //用户类型-默认三方人员
         mapper.addOperationReplace("hospital_id", hospitalTask.loadCache().getIdCache());
         mapper.addOperationReplace("duty_dept", hospitalTask.loadCache().getIdCache());
         mapper.trans2JdbcRow(list);