修改bug

src/main/java/com/dashitech/api/rest/ApiRest.java

@@ -1,11 +1,9 @@
 package com.dashitech.api.rest;
 
 import com.dashitech.migration.StartApplication;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "/api")
@@ -17,10 +15,12 @@ public class ApiRest {
 
     @RequestMapping(value = "/start", method = RequestMethod.GET)
     @ResponseBody
-    public String start() {
-
-        startApplication.start();
-
+    public String start(String taskName) {
+        if (StringUtils.isNotEmpty(taskName)) {
+            startApplication.start(taskName);
+        } else {
+            startApplication.start();
+        }
         return "ok";
     }
 

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

@@ -21,70 +21,83 @@ public class StartApplication {
     public void start() {
         log.info("########### 开始迁移任务！###########");
         SqlTask task = null;
-//        task = SpringContextHolder.getBean("dictionaryTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("tokenTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("attachmentTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("opLogTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("hospitalTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("hospitalConfigTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("groupTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("departmentTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("companyTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("userTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("userGroupTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("roleUserTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("areaTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("placeTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentCategoryTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentCategoryConfigTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentLogTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentSynergeticTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("incidentAssignManagerTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("workHourManagementTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("solutionTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("solutionIntroduceTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("productTask");
-//        task.start();
+        task = SpringContextHolder.getBean("dictionaryTask");
+        task.start();
+        task = SpringContextHolder.getBean("tokenTask");
+        task.start();
+        task = SpringContextHolder.getBean("attachmentTask");
+        task.start();
+        task = SpringContextHolder.getBean("opLogTask");
+        task.start();
+        task = SpringContextHolder.getBean("hospitalTask");
+        task.start();
+        task = SpringContextHolder.getBean("hospitalConfigTask");
+        task.start();
+        task = SpringContextHolder.getBean("areaTask");
+        task.start();
+        task = SpringContextHolder.getBean("placeTask");
+        task.start();
+        task = SpringContextHolder.getBean("groupTask");
+        task.start();
+        task = SpringContextHolder.getBean("departmentTask");
+        task.start();
+        task = SpringContextHolder.getBean("companyTask");
+        task.start();
+        task = SpringContextHolder.getBean("userTask");
+        task.start();
+        task = SpringContextHolder.getBean("userGroupTask");
+        task.start();
+        task = SpringContextHolder.getBean("roleUserTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentCategoryTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentCategoryConfigTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentLogTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentSynergeticTask");
+        task.start();
+        task = SpringContextHolder.getBean("incidentAssignManagerTask");
+        task.start();
+        task = SpringContextHolder.getBean("workHourManagementTask");
+        task.start();
+        task = SpringContextHolder.getBean("solutionTask");
+        task.start();
+        task = SpringContextHolder.getBean("solutionIntroduceTask");
+        task.start();
+        task = SpringContextHolder.getBean("productTask");
+        task.start();
         task = SpringContextHolder.getBean("consumableTask");
         task.start();
-//        task = SpringContextHolder.getBean("consumableHistoryTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("repairSummaryTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("summaryConsumableTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("callLogTask");
-//        task.start();
-//        task = SpringContextHolder.getBean("hjzxRecordTask");
-//        task.start();
+        task = SpringContextHolder.getBean("consumableHistoryTask");
+        task.start();
+        task = SpringContextHolder.getBean("repairSummaryTask");
+        task.start();
+        task = SpringContextHolder.getBean("summaryConsumableTask");
+        task.start();
+        task = SpringContextHolder.getBean("callLogTask");
+        task.start();
+        task = SpringContextHolder.getBean("hjzxRecordTask");
+        task.start();
 
 
         log.info("########### 迁移任务完成！###########");
     }
 
+    public void start(String taskName) {
+        try {
+            SqlTask sqlTask = SpringContextHolder.getBean(taskName);
+            log.info("########### 开始迁移指定"+taskName+"任务！###########");
+            sqlTask.start();
+            log.info("########### 迁移指定"+taskName+"任务完成！###########");
+        } catch (Exception e) {
+            log.error("指定任务" + taskName + "转换有误：" + e.getMessage());
+            e.printStackTrace();
+        }
+
+    }
+
 
 }

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

@@ -7,6 +7,7 @@ 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;
 
@@ -22,18 +23,26 @@ public class DepartmentTask extends BaseTask {
 
     public static Log log = LogFactory.getLog(DepartmentTask.class);
 
+    @Autowired
+    private AreaTask areaTask;
+
+    @Autowired
+    private PlaceTask placeTask;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void start() {
         if ("xiangyang".equals(appName)) {
             log.info(" *** DepartmentTask start 开始 *** ");
-            StringBuffer sql = new StringBuffer("SELECT dept,CODE,parentId,email,delete_flag,address as _address,place_id as floor_id,area_id as building_id,pinyin,");
+            StringBuffer sql = new StringBuffer("SELECT dept,IFNULL(CODE,pinyin) as CODE,parentId,email,delete_flag,address as _address,place_id as floor_id,area_id as building_id,pinyin,");
             sql.append("branch_id as _hospital_id,dept_alias,input_code,phone as many_phone,qrcode,1 as flag,IF(phone is not null,SUBSTRING_INDEX(phone,',',1),null) as _phone ");
-            sql.append(" FROM itsm_uc_dept where id in (select distinct b.id from itsm_incident a join itsm_uc_dept b on a.dept = b.id where a.dept > 1204)");
+            sql.append(" FROM itsm_uc_dept ");
             List<Map<String, Object>> deptList = jdbcTemplateMdv2.queryForList(sql.toString());
 
             FieldMapper mapper = new FieldMapper();
             mapper.addOperationAdd("_type", getDicId(jdbcTemplateHsms, "dept_type", "other"));
+            mapper.addOperationReplace("floor_id", placeTask.loadCache().getIdCache());
+            mapper.addOperationReplace("building_id", areaTask.loadCache().getIdCache());
             mapper.trans2JdbcRow(deptList);
 
             FieldMapper deptMapper = this.loadCache();

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

@@ -29,6 +29,8 @@ public class UserTask extends BaseTask {
     SqlTask departmentTask;
     @Autowired
     SqlTask dictionaryTask;
+    @Autowired
+    SqlTask companyTask;
 
     public static Log log = LogFactory.getLog(UserTask.class);
 
@@ -51,6 +53,7 @@ public class UserTask extends BaseTask {
         mapper.addOperationReplace("hospital_id", hospitalTask.loadCache().getIdCache());
         mapper.addOperationReplace("duty_dept", hospitalTask.loadCache().getIdCache());
         mapper.addOperationReplace("GENDER", dictionaryTask.loadCache().getIdCache());
+        mapper.addOperationReplace("company_id", companyTask.loadCache().getIdCache());
         if ("xiangyang".equals(appName)) {
             mapper.addOperationReplace("DEPTID", departmentTask.loadCache().getIdCache());
         }