CX 6 months ago
parent
commit
64246f4219

+ 55 - 52
src/main/java/com/dashitech/migration/StartApplication.java

@@ -25,58 +25,61 @@ 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("areaTask");
51
-        //task.start();
52
-        task = SpringContextHolder.getBean("placeTask");
53
-        task.start();
54
-        //task = SpringContextHolder.getBean("incidentCategoryTask");
55
-        //task.start();
56
-        //task = SpringContextHolder.getBean("incidentCategoryConfigTask");
57
-        //task.start();
58
-        //task = SpringContextHolder.getBean("incidentAssignManagerTask");
59
-        //task.start();
60
-        //task = SpringContextHolder.getBean("incidentTask");
61
-        //task.start();
62
-        //task = SpringContextHolder.getBean("workHourManagementTask");
63
-        //task.start();
64
-        //task = SpringContextHolder.getBean("solutionTask");
65
-        //task.start();
66
-        //task = SpringContextHolder.getBean("solutionIntroduceTask");
67
-        //task.start();
68
-        //task = SpringContextHolder.getBean("consumableTask");
69
-        //task.start();
70
-        //task = SpringContextHolder.getBean("consumableHistoryTask");
71
-        //task.start();
72
-        //task = SpringContextHolder.getBean("repairSummaryTask");
73
-        //task.start();
74
-        //task = SpringContextHolder.getBean("summaryConsumableTask");
75
-        //task.start();
76
-        //task = SpringContextHolder.getBean("callLogTask");
77
-        //task.start();
78
-        //task = SpringContextHolder.getBean("hjzxRecordTask");
79
-        //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("areaTask");
51
+//        task.start();
52
+//        task = SpringContextHolder.getBean("placeTask");
53
+//		  task.start();
54
+//        task = SpringContextHolder.getBean("incidentCategoryTask");
55
+//        task.start();
56
+//        task = SpringContextHolder.getBean("incidentCategoryConfigTask");
57
+//        task.start();
58
+//        task = SpringContextHolder.getBean("incidentTask");
59
+//        task.start();
60
+//        task = SpringContextHolder.getBean("incidentLogTask");
61
+//        task.start();
62
+//        task = SpringContextHolder.getBean("incidentSynergeticTask");
63
+//        task.start();
64
+//        task = SpringContextHolder.getBean("workHourManagementTask");
65
+//        task.start();
66
+//        task = SpringContextHolder.getBean("solutionTask");
67
+//        task.start();
68
+//        task = SpringContextHolder.getBean("solutionIntroduceTask");
69
+//        task.start();
70
+//        task = SpringContextHolder.getBean("consumableTask");
71
+//        task.start();
72
+//        task = SpringContextHolder.getBean("consumableHistoryTask");
73
+//        task.start();
74
+//        task = SpringContextHolder.getBean("repairSummaryTask");
75
+//        task.start();
76
+//        task = SpringContextHolder.getBean("summaryConsumableTask");
77
+//        task.start();
78
+//        task = SpringContextHolder.getBean("callLogTask");
79
+//        task.start();
80
+//        task = SpringContextHolder.getBean("hjzxRecordTask");
81
+//        task.start();
82
+		
80 83
 
81 84
 
82 85
         log.info("########### 迁移任务完成!###########");

+ 15 - 18
src/main/java/com/dashitech/migration/task/incident/IncidentLogTask.java

@@ -22,10 +22,13 @@ import java.util.Map;
22 22
 public class IncidentLogTask extends BaseTask {
23 23
 
24 24
     @Autowired
25
+    SqlTask userTask;
26
+    @Autowired
27
+    SqlTask groupTask;
28
+    @Autowired
25 29
     SqlTask hospitalTask;
26
-
27 30
     @Autowired
28
-    SqlTask departmentTask;
31
+    SqlTask dictionaryTask;
29 32
 
30 33
     public static Log log = LogFactory.getLog(IncidentLogTask.class);
31 34
 
@@ -35,38 +38,32 @@ public class IncidentLogTask extends BaseTask {
35 38
         log.info(" *** IncidentLogTask start 开始 *** ");
36 39
 
37 40
         StringBuffer sb = new StringBuffer();
38
-        sb.append(" select * from itsm_incident ");
41
+        sb.append(" select * from itsm_incident_log ");
39 42
 
40 43
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
41 44
 
42 45
         FieldMapper mapper = new FieldMapper();
43
-        mapper.addOperationRemove("id").addOperationRemove("version");
46
+        Map<Long, Long> userCache = userTask.loadCache().getIdCache();
47
+        mapper.addOperationUpdate("hos_id", "branch_id");
48
+        mapper.addOperationReplace("log_type", dictionaryTask.loadCache().getIdCache());
49
+        mapper.addOperationReplace("appointor_id", userCache);
50
+        mapper.addOperationReplace("worker_id", userCache);
51
+        mapper.addOperationReplace("group_id", groupTask.loadCache().getIdCache());
52
+        mapper.addOperationReplace("duty_id", hospitalTask.loadCache().getIdCache());
44 53
         mapper.trans2JdbcRow(list);
45 54
 
46
-        FieldMapper userMapper = loadCache();
47 55
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
48
-        jdbcUtil.batchPageInsert("itsm_itsm_incident", mapper.getRows());
56
+        jdbcUtil.batchPageInsert("itsm_itsm_incident_log", mapper.getRows());
49 57
 
50 58
         //clear释放内存
51 59
         mapper.clear();
52
-        userMapper.clear();
53 60
     }
54 61
 
55 62
     @Override
56 63
     public FieldMapper loadCache() {
57 64
         log.info(" *** IncidentLogTask loadCache 开始 *** ");
58 65
 
59
-        String sql = " select id,ACCOUNT,delete_flag from itsm_incident ";
60
-        List<Map<String, Object>> list = jdbcTemplateHsms.queryForList(sql);
61
-        sql = " select id,ACCOUNT,delete_flag from itsm_itsm_incident ";
62
-        List<Map<String, Object>> list2 = jdbcTemplateMdv2.queryForList(sql);
63
-
64
-        FieldMapper mapper = new FieldMapper();
65
-        mapper.addFieldMapper("ACCOUNT", "ACCOUNT");
66
-        mapper.addFieldMapper("delete_flag", "delete_flag");
67
-
68
-        DataMigrationter.loadCache(list, list2, mapper);
69 66
 
70
-        return mapper;
67
+        return null;
71 68
     }
72 69
 }

+ 7 - 18
src/main/java/com/dashitech/migration/task/incident/IncidentSynergeticTask.java

@@ -23,9 +23,8 @@ public class IncidentSynergeticTask extends BaseTask {
23 23
 
24 24
     @Autowired
25 25
     SqlTask hospitalTask;
26
-
27 26
     @Autowired
28
-    SqlTask departmentTask;
27
+    SqlTask userTask;
29 28
 
30 29
     public static Log log = LogFactory.getLog(IncidentSynergeticTask.class);
31 30
 
@@ -35,38 +34,28 @@ public class IncidentSynergeticTask extends BaseTask {
35 34
         log.info(" *** IncidentSynergeticTask start 开始 *** ");
36 35
 
37 36
         StringBuffer sb = new StringBuffer();
38
-        sb.append(" select * from itsm_incident ");
37
+        sb.append(" select * from itsm_incident_synergetic ");
39 38
 
40 39
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
41 40
 
42 41
         FieldMapper mapper = new FieldMapper();
43
-        mapper.addOperationRemove("id").addOperationRemove("version");
42
+        mapper.addOperationUpdate("hos_id", "branch_id");
43
+        mapper.addOperationReplace("user_id", userTask.loadCache().getIdCache());
44
+        mapper.addOperationReplace("duty_id", hospitalTask.loadCache().getIdCache());
44 45
         mapper.trans2JdbcRow(list);
45 46
 
46
-        FieldMapper userMapper = loadCache();
47 47
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
48
-        jdbcUtil.batchPageInsert("itsm_itsm_incident", mapper.getRows());
48
+        jdbcUtil.batchPageInsert("itsm_itsm_incident_synergetic", mapper.getRows());
49 49
 
50 50
         //clear释放内存
51 51
         mapper.clear();
52
-        userMapper.clear();
53 52
     }
54 53
 
55 54
     @Override
56 55
     public FieldMapper loadCache() {
57 56
         log.info(" *** IncidentSynergeticTask loadCache 开始 *** ");
58 57
 
59
-        String sql = " select id,ACCOUNT,delete_flag from itsm_incident ";
60
-        List<Map<String, Object>> list = jdbcTemplateHsms.queryForList(sql);
61
-        sql = " select id,ACCOUNT,delete_flag from itsm_itsm_incident ";
62
-        List<Map<String, Object>> list2 = jdbcTemplateMdv2.queryForList(sql);
63
-
64
-        FieldMapper mapper = new FieldMapper();
65
-        mapper.addFieldMapper("ACCOUNT", "ACCOUNT");
66
-        mapper.addFieldMapper("delete_flag", "delete_flag");
67
-
68
-        DataMigrationter.loadCache(list, list2, mapper);
69 58
 
70
-        return mapper;
59
+        return null;
71 60
     }
72 61
 }

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

@@ -45,7 +45,7 @@ public class IncidentTask extends BaseTask {
45 45
         log.info(" *** IncidentTask start 开始 *** ");
46 46
 
47 47
         StringBuffer sb = new StringBuffer();
48
-        sb.append(" select * from itsm_incident limit 0,1000 ");
48
+        sb.append(" select * from itsm_incident ");
49 49
 
50 50
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
51 51
 
@@ -53,7 +53,6 @@ public class IncidentTask extends BaseTask {
53 53
         Map<Long, Long> userCache = userTask.loadCache().getIdCache();
54 54
         Map<Long, Long> dicCache = dictionaryTask.loadCache().getIdCache();
55 55
 
56
-        mapper.addOperationRemove("id").addOperationRemove("version");
57 56
         mapper.addOperationRemove("emergencyid").addOperationRemove("influenceid");
58 57
         mapper.addOperationUpdate("priority_id", "priorityid");
59 58
         mapper.addOperationUpdate("hos_id", "branch_id");

+ 18 - 0
src/main/java/com/dashitech/migration/task/other/DictionaryTask.java

@@ -122,6 +122,24 @@ public class DictionaryTask extends BaseTask {
122 122
         idCache.put(1601L,20417L);
123 123
         idCache.put(1602L,20418L);
124 124
 
125
+        //事件日志-incident_log_type
126
+        idCache.put(1736L,20435L);
127
+        idCache.put(1737L,20436L);
128
+        idCache.put(1738L,20437L);
129
+        idCache.put(1739L,20438L);
130
+        idCache.put(1740L,20439L);
131
+        idCache.put(1741L,20440L);
132
+        idCache.put(1742L,20441L);
133
+        idCache.put(1743L,20442L);
134
+        idCache.put(1744L,20443L);
135
+        idCache.put(1745L,20444L);
136
+        idCache.put(1751L,20445L);
137
+        idCache.put(1752L,20446L);
138
+        idCache.put(1753L,20447L);
139
+        idCache.put(1754L,20448L);
140
+        idCache.put(1755L,20449L);
141
+        idCache.put(1766L,20450L);
142
+
125 143
         return mapper;
126 144
     }
127 145
 }