CX пре 6 месеци
родитељ
комит
c1ee69264e

+ 44 - 44
src/main/java/com/dashitech/migration/StartApplication.java

@@ -25,52 +25,52 @@ public class StartApplication {
25 25
     public void start() {
26 26
         log.info("########### 开始迁移任务!###########");
27 27
         SqlTask task = null;
28
-        task = SpringContextHolder.getBean("dictionaryTask");
29
-        task.start();
30
-        task = SpringContextHolder.getBean("tokenTask");
31
-        task.start();
32
-        task = SpringContextHolder.getBean("attachmentTask");
33
-        task.start();
34
-        task = SpringContextHolder.getBean("hospitalTask");
35
-        task.start();
36
-        task = SpringContextHolder.getBean("hospitalConfigTask");
37
-        task.start();
38
-        task = SpringContextHolder.getBean("groupTask");
39
-        task.start();
40
-        task = SpringContextHolder.getBean("departmentTask");
41
-        task.start();
42
-        task = SpringContextHolder.getBean("companyTask");
43
-        task.start();
44
-        task = SpringContextHolder.getBean("userTask");
45
-        task.start();
46
-        task = SpringContextHolder.getBean("userGroupTask");
47
-        task.start();
48
-        task = SpringContextHolder.getBean("roleUserTask");
49
-        task.start();
50
-        task = SpringContextHolder.getBean("incidentCategoryTask");
51
-        task.start();
52
-        task = SpringContextHolder.getBean("incidentCategoryConfigTask");
53
-        task.start();
28
+//        task = SpringContextHolder.getBean("dictionaryTask");
29
+//        task.start();
30
+//        task = SpringContextHolder.getBean("tokenTask");
31
+//        task.start();
32
+//        task = SpringContextHolder.getBean("attachmentTask");
33
+//        task.start();
34
+//        task = SpringContextHolder.getBean("hospitalTask");
35
+//        task.start();
36
+//        task = SpringContextHolder.getBean("hospitalConfigTask");
37
+//        task.start();
38
+//        task = SpringContextHolder.getBean("groupTask");
39
+//        task.start();
40
+//        task = SpringContextHolder.getBean("departmentTask");
41
+//        task.start();
42
+//        task = SpringContextHolder.getBean("companyTask");
43
+//        task.start();
44
+//        task = SpringContextHolder.getBean("userTask");
45
+//        task.start();
46
+//        task = SpringContextHolder.getBean("userGroupTask");
47
+//        task.start();
48
+//        task = SpringContextHolder.getBean("roleUserTask");
49
+//        task.start();
50
+//        task = SpringContextHolder.getBean("incidentCategoryTask");
51
+//        task.start();
52
+//        task = SpringContextHolder.getBean("incidentCategoryConfigTask");
53
+//        task.start();
54 54
         task = SpringContextHolder.getBean("incidentTask");
55 55
         task.start();
56
-        task = SpringContextHolder.getBean("workHourManagementTask");
57
-        task.start();
58
-        task = SpringContextHolder.getBean("solutionTask");
59
-        task.start();
60
-        task = SpringContextHolder.getBean("solutionIntroduceTask");
61
-        task.start();
62
-        task = SpringContextHolder.getBean("consumableTask");
63
-        task.start();
64
-        task = SpringContextHolder.getBean("consumableHistoryTask");
65
-        task.start();
66
-        task = SpringContextHolder.getBean("repairSummaryTask");
67
-        task.start();
68
-        task = SpringContextHolder.getBean("summaryConsumableTask");
69
-        task.start();
70
-        task = SpringContextHolder.getBean("callLogTask");
71
-        task.start();
72
-        task = SpringContextHolder.getBean("hjzxRecordTask");
73
-        task.start();
56
+//        task = SpringContextHolder.getBean("workHourManagementTask");
57
+//        task.start();
58
+//        task = SpringContextHolder.getBean("solutionTask");
59
+//        task.start();
60
+//        task = SpringContextHolder.getBean("solutionIntroduceTask");
61
+//        task.start();
62
+//        task = SpringContextHolder.getBean("consumableTask");
63
+//        task.start();
64
+//        task = SpringContextHolder.getBean("consumableHistoryTask");
65
+//        task.start();
66
+//        task = SpringContextHolder.getBean("repairSummaryTask");
67
+//        task.start();
68
+//        task = SpringContextHolder.getBean("summaryConsumableTask");
69
+//        task.start();
70
+//        task = SpringContextHolder.getBean("callLogTask");
71
+//        task.start();
72
+//        task = SpringContextHolder.getBean("hjzxRecordTask");
73
+//        task.start();
74 74
 
75 75
 
76 76
         log.info("########### 迁移任务完成!###########");

+ 9 - 2
src/main/java/com/dashitech/migration/task/incident/IncidentTask.java

@@ -33,7 +33,7 @@ public class IncidentTask extends BaseTask {
33 33
     SqlTask departmentTask;
34 34
 
35 35
     @Autowired
36
-    SqlTask incidentCategoryTask;
36
+    SqlTask dictionaryTask;
37 37
 
38 38
     public static Log log = LogFactory.getLog(IncidentTask.class);
39 39
 
@@ -49,6 +49,7 @@ public class IncidentTask extends BaseTask {
49 49
 
50 50
         FieldMapper mapper = new FieldMapper();
51 51
         Map<Long, Long> userCache = userTask.loadCache().getIdCache();
52
+        Map<Long, Long> dicCache = dictionaryTask.loadCache().getIdCache();
52 53
 
53 54
         mapper.addOperationRemove("id").addOperationRemove("version");
54 55
         mapper.addOperationRemove("emergencyid").addOperationRemove("influenceid");
@@ -56,7 +57,13 @@ public class IncidentTask extends BaseTask {
56 57
         mapper.addOperationUpdate("hos_id", "branch_id");
57 58
         //襄阳id4-
58 59
         mapper.addOperationReplace("userid", userCache);
59
-        mapper.addOperationReplace("close_userid", userCache);
60
+        mapper.addOperationReplace("close_userid", dicCache);
61
+        mapper.addOperationReplace("degreeid", dicCache);
62
+        mapper.addOperationReplace("priorityid", dicCache);
63
+        mapper.addOperationReplace("sourceid", dicCache);
64
+        mapper.addOperationReplace("statusid", dicCache);
65
+        mapper.addOperationReplace("handleresult", dicCache);
66
+        mapper.addOperationReplace("wxdegreeid", dicCache);
60 67
         mapper.addOperationReplace("requesterid", userCache);
61 68
         mapper.addOperationReplace("handleruserid", userCache);
62 69
         mapper.addOperationReplace("handlingPersonnelUserId", userCache);