111

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

@@ -1,5 +1,6 @@
 package com.dashitech.migration;
 
+import com.dashitech.migration.core.FieldMapper;
 import com.dashitech.utils.SpringContextHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,8 +38,8 @@ public class StartApplication {
 //        task.start();
 //        task = SpringContextHolder.getBean("companyTask");
 //        task.start();
-        task = SpringContextHolder.getBean("userTask");
-        task.start();
+//        task = SpringContextHolder.getBean("userTask");
+//        task.start();
 //        task = SpringContextHolder.getBean("userGroupTask");
 //        task.start();
 //        task = SpringContextHolder.getBean("roleUserTask");

src/main/java/com/dashitech/migration/task/incident/IncidentLogTask.java

@@ -50,11 +50,19 @@ public class IncidentLogTask extends BaseTask {
         mapper.addOperationReplace("worker_id", userCache);
         mapper.addOperationReplace("group_id", groupTask.loadCache().getIdCache());
         mapper.addOperationReplace("duty_id", hospitalTask.loadCache().getIdCache());
+        mapper.addOperationReplace("extra1", dictionaryTask.loadCache().getIdCache());
         mapper.trans2JdbcRow(list);
 
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
         jdbcUtil.batchPageInsert("itsm_itsm_incident_log", mapper.getRows());
 
+        //补空操作类型数据
+        String sql = " UPDATE itsm_itsm_incident_log SET log_type = (SELECT id from itsm_base_dictionary WHERE _key = 'incident_log_type' and _value = 'edit' ) WHERE log_type is null ";
+        jdbcTemplateHsms.execute(sql);
+        //补超时颜色
+        sql = " UPDATE itsm_itsm_rule_colour SET colourInfo = (SELECT id from itsm_base_dictionary WHERE _key = 'incident_colourinfo' and _value = '#FADB14' ) WHERE colourInfo is null ";
+        jdbcTemplateHsms.execute(sql);
+
         //clear释放内存
         mapper.clear();
     }

src/main/java/com/dashitech/migration/task/incident/IncidentTask.java

@@ -65,6 +65,7 @@ public class IncidentTask extends BaseTask {
         mapper.addOperationReplace("sourceid", dicCache);
         mapper.addOperationReplace("statusid", dicCache);
         mapper.addOperationReplace("handleresult", dicCache);
+        mapper.addOperationReplace("handlecategory", dicCache);
         mapper.addOperationReplace("wxdegreeid", dicCache);
         mapper.addOperationReplace("requesterid", userCache);
         mapper.addOperationReplace("handleruserid", userCache);

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

@@ -19,6 +19,9 @@ import java.util.Map;
 public class DictionaryTask extends BaseTask {
 
     public static Log log = LogFactory.getLog(DictionaryTask.class);
+
+    private static Map<Long, Long> idCache = new HashMap<>();
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void start() {
@@ -28,150 +31,62 @@ public class DictionaryTask extends BaseTask {
     @Override
     public FieldMapper loadCache() {
         FieldMapper mapper = null;
-        if ("xiangyang".equals(appName)) {
-            mapper = loadXiangYangCache();
-        } else {
-            mapper = loadNanJingCache();
+
+        if(idCache.isEmpty()) {
+            mapper = loadCache2();
+        }else {
+            mapper = new FieldMapper();
+            mapper.setIdCache(idCache);
         }
+
         return mapper;
     }
 
 
-    private FieldMapper loadXiangYangCache() {
-        log.info(" *** 加载襄阳字典缓存 *** ");
-        FieldMapper mapper = new FieldMapper();
-        Map<Long, Long> idCache = new HashMap<>();
-        mapper.setIdCache(idCache);
-        //知识库
-        idCache.put(71L, 20404L); //待审核
-        idCache.put(72L, 20405L); //已发布
-        idCache.put(73L, 20406L); //待整改
-        idCache.put(74L, 20407L); //已停用
-        //耗材消耗
-        idCache.put(1735L, 20557L);//消耗
-        idCache.put(1736L, 20558L);//撤销
-        //公司分类
-        idCache.put(1709L,20240L);
-        idCache.put(1710L,20241L);
-        //性别
-        idCache.put(1609L,279L);
-        idCache.put(1610L,280L);
-
-        //事件-关闭代码
-        idCache.put(1572L,20501L);
-        idCache.put(1573L,20502L);
-        idCache.put(1575L,20503L);
-        idCache.put(1574L,20504L);
-        idCache.put(1576L,20504L);
-        idCache.put(1577L,20504L);
-
-        //事件-满意度
-        idCache.put(1578L,20496L);
-        idCache.put(1579L,20497L);
-        idCache.put(1580L,20498L);
-        idCache.put(1581L,20499L);
-        idCache.put(1582L,20500L);
-
-        //事件-优先级
-        idCache.put(1560L,5L);
-        idCache.put(1561L,4L);
-        idCache.put(1562L,3L);
-        idCache.put(1563L,2L);
-        idCache.put(1704L,1L);
-
-        //事件-incident_source
-        idCache.put(1547L,20484L);
-        idCache.put(1548L,20485L);
-        idCache.put(1549L,20486L);
-        idCache.put(1550L,20488L);
-        idCache.put(1551L,20487L);
-        idCache.put(1552L,20488L);
-        idCache.put(1700L,20488L);
-        idCache.put(1747L,20488L);
-
-        //事件-incident_status
-        idCache.put(1479L,20505L);
-        idCache.put(1543L,20506L);
-        idCache.put(1544L,20507L);
-        idCache.put(1545L,20508L);
-        idCache.put(1546L,20508L);
-        idCache.put(1674L,20509L);
-        idCache.put(1748L,20510L);
-        idCache.put(1749L,20511L);
-        idCache.put(1750L,20512L);
-
-        //事件-incident_handleresult
-        idCache.put(1568L,20483L);
-        idCache.put(1569L,20483L);
-        idCache.put(1570L,20483L);
-        idCache.put(1571L,20483L);
-
-        //事件-wxincident_degree
-        idCache.put(1598L,20496L);
-        idCache.put(1599L,20497L);
-        idCache.put(1600L,20498L);
-        idCache.put(1601L,20499L);
-        idCache.put(1602L,20500L);
-
-        //事件日志-incident_log_type
-        idCache.put(1736L,20517L);
-        idCache.put(1737L,20518L);
-        idCache.put(1738L,20519L);
-        idCache.put(1739L,20520L);
-        idCache.put(1740L,20521L);
-        idCache.put(1741L,20522L);
-        idCache.put(1742L,20523L);
-        idCache.put(1743L,20524L);
-        idCache.put(1744L,20525L);
-        idCache.put(1745L,20526L);
-        idCache.put(1751L,20527L);
-        idCache.put(1752L,20528L);
-        idCache.put(1753L,20529L);
-        idCache.put(1754L,20530L);
-        idCache.put(1755L,20531L);
-        idCache.put(1766L,20532L);
-
-        return mapper;
-    }
 
-    private FieldMapper loadNanJingCache() {
-        log.info(" *** 加载南京字典缓存 *** ");
+    private FieldMapper loadCache2() {
+        log.info(" *** 加载DictionaryTask字典缓存 *** ");
         FieldMapper mapper = new FieldMapper();
         Map<Long, Long> idCache = new HashMap<>();
         mapper.setIdCache(idCache);
 
         //知识库
-        idCache.put(71L, 20328L); //待审核
-        idCache.put(72L, 20329L); //已发布
-        idCache.put(73L, 20330L); //待整改
-        idCache.put(74L, 20331L); //已停用
+        idCache.put(71L, getDicId(jdbcTemplateHsms,"solution_status","2")); //待审核
+        idCache.put(72L, getDicId(jdbcTemplateHsms,"solution_status","3")); //已发布
+        idCache.put(73L, getDicId(jdbcTemplateHsms,"solution_status","4")); //待整改
+        idCache.put(74L, getDicId(jdbcTemplateHsms,"solution_status","5")); //已停用
 
         //耗材消耗
-        idCache.put(1732L, 20475L);//消耗
-        idCache.put(1733L, 20476L);//撤销
+        if ("xiangyang".equals(appName)) {
+            idCache.put(1735L, getDicId(jdbcTemplateHsms,"consumables_consume_type","1"));//消耗
+            idCache.put(1736L, getDicId(jdbcTemplateHsms,"consumables_consume_type","2"));//撤销
+        }else {
+            idCache.put(1732L, getDicId(jdbcTemplateHsms,"consumables_consume_type","1"));//消耗
+            idCache.put(1733L, getDicId(jdbcTemplateHsms,"consumables_consume_type","2"));//撤销
+        }
 
         //公司分类
-        idCache.put(1709L,20309L);
-        idCache.put(1710L,20311L);
+        idCache.put(1709L,getDicId(jdbcTemplateHsms,"company_type","1"));
+        idCache.put(1710L,getDicId(jdbcTemplateHsms,"company_type","3"));
 
         //性别
-        idCache.put(1609L,279L);
-        idCache.put(1610L,280L);
+        idCache.put(1609L,getDicId(jdbcTemplateHsms,"user_gender","0"));
+        idCache.put(1610L,getDicId(jdbcTemplateHsms,"user_gender","1"));
 
         //事件-关闭代码
-        idCache.put(1572L,20419L);
-        idCache.put(1573L,20420L);
-        idCache.put(1575L,20421L);
-        idCache.put(1574L,20422L);
-        idCache.put(1576L,20422L);
-        idCache.put(1577L,20422L);
+        idCache.put(1572L,getDicId(jdbcTemplateHsms,"incident_closecode","1"));
+        idCache.put(1573L,getDicId(jdbcTemplateHsms,"incident_closecode","2"));
+        idCache.put(1575L,getDicId(jdbcTemplateHsms,"incident_closecode","3"));
+        idCache.put(1574L,getDicId(jdbcTemplateHsms,"incident_closecode","4"));
+        idCache.put(1576L,getDicId(jdbcTemplateHsms,"incident_closecode","4"));
+        idCache.put(1577L,getDicId(jdbcTemplateHsms,"incident_closecode","4"));
 
         //事件-满意度
-        idCache.put(1578L,20414L);
-        idCache.put(1579L,20415L);
-        idCache.put(1580L,20416L);
-        idCache.put(1581L,20417L);
-        idCache.put(1582L,20418L);
+        idCache.put(1578L,getDicId(jdbcTemplateHsms,"incident_degree","5"));
+        idCache.put(1579L,getDicId(jdbcTemplateHsms,"incident_degree","4"));
+        idCache.put(1580L,getDicId(jdbcTemplateHsms,"incident_degree","3"));
+        idCache.put(1581L,getDicId(jdbcTemplateHsms,"incident_degree","2"));
+        idCache.put(1582L,getDicId(jdbcTemplateHsms,"incident_degree","1"));
 
         //事件-优先级
         idCache.put(1560L,5L);
@@ -181,56 +96,85 @@ public class DictionaryTask extends BaseTask {
         idCache.put(1704L,1L);
 
         //事件-incident_source
-        idCache.put(1547L,20402L);
-        idCache.put(1548L,20403L);
-        idCache.put(1549L,1549L);
-        idCache.put(1550L,20406L);
-        idCache.put(1551L,20405L);
-        idCache.put(1552L,20406L);
-        idCache.put(1700L,20406L);
-        idCache.put(1747L,20406L);
+        idCache.put(1547L,getDicId(jdbcTemplateHsms,"incident_source","phone"));
+        idCache.put(1548L,getDicId(jdbcTemplateHsms,"incident_source","record"));
+        idCache.put(1549L,getDicId(jdbcTemplateHsms,"incident_source","im"));
+        idCache.put(1550L,getDicId(jdbcTemplateHsms,"incident_source","other"));
+        idCache.put(1551L,getDicId(jdbcTemplateHsms,"incident_source","leader"));
+        idCache.put(1552L,getDicId(jdbcTemplateHsms,"incident_source","other"));
+        idCache.put(1700L,getDicId(jdbcTemplateHsms,"incident_source","other"));
+        idCache.put(1747L,getDicId(jdbcTemplateHsms,"incident_source","other"));
 
         //事件-incident_status
-        idCache.put(1479L,20423L);
-        idCache.put(1543L,20424L);
-        idCache.put(1544L,20425L);
-        idCache.put(1545L,20426L);
-        idCache.put(1546L,20426L);
-        idCache.put(1674L,20427L);
-        idCache.put(1748L,20428L);
-        idCache.put(1749L,20429L);
-        idCache.put(1750L,20430L);
+        idCache.put(1479L,getDicId(jdbcTemplateHsms,"incident_status","reassign"));
+        idCache.put(1543L,getDicId(jdbcTemplateHsms,"incident_status","pending"));
+        idCache.put(1544L,getDicId(jdbcTemplateHsms,"incident_status","handler"));
+        idCache.put(1545L,getDicId(jdbcTemplateHsms,"incident_status","close"));
+        idCache.put(1546L,getDicId(jdbcTemplateHsms,"incident_status","close"));
+        idCache.put(1674L,getDicId(jdbcTemplateHsms,"incident_status","storage"));
+        idCache.put(1748L,getDicId(jdbcTemplateHsms,"incident_status","cancel"));
+        idCache.put(1749L,getDicId(jdbcTemplateHsms,"incident_status","reject"));
+        idCache.put(1750L,getDicId(jdbcTemplateHsms,"incident_status","accept"));
 
         //事件-incident_handleresult
-        idCache.put(1568L,20401L);
-        idCache.put(1569L,20401L);
-        idCache.put(1570L,20401L);
-        idCache.put(1571L,20401L);
+        idCache.put(1568L,getDicId(jdbcTemplateHsms,"incident_handle_type","1"));
+        idCache.put(1569L,getDicId(jdbcTemplateHsms,"incident_handle_type","1"));
+        idCache.put(1570L,getDicId(jdbcTemplateHsms,"incident_handle_type","1"));
+        idCache.put(1571L,getDicId(jdbcTemplateHsms,"incident_handle_type","1"));
 
         //事件-wxincident_degree
-        idCache.put(1598L,20414L);
-        idCache.put(1599L,20415L);
-        idCache.put(1600L,20416L);
-        idCache.put(1601L,20417L);
-        idCache.put(1602L,20418L);
+        idCache.put(1598L,getDicId(jdbcTemplateHsms,"incident_degree","5"));
+        idCache.put(1599L,getDicId(jdbcTemplateHsms,"incident_degree","4"));
+        idCache.put(1600L,getDicId(jdbcTemplateHsms,"incident_degree","3"));
+        idCache.put(1601L,getDicId(jdbcTemplateHsms,"incident_degree","2"));
+        idCache.put(1602L,getDicId(jdbcTemplateHsms,"incident_degree","1"));
 
         //事件日志-incident_log_type
-        idCache.put(1736L,20435L);
-        idCache.put(1737L,20436L);
-        idCache.put(1738L,20437L);
-        idCache.put(1739L,20438L);
-        idCache.put(1740L,20439L);
-        idCache.put(1741L,20440L);
-        idCache.put(1742L,20441L);
-        idCache.put(1743L,20442L);
-        idCache.put(1744L,20443L);
-        idCache.put(1745L,20444L);
-        idCache.put(1751L,20445L);
-        idCache.put(1752L,20446L);
-        idCache.put(1753L,20447L);
-        idCache.put(1754L,20448L);
-        idCache.put(1755L,20449L);
-        idCache.put(1766L,20450L);
+        idCache.put(1736L,getDicId(jdbcTemplateHsms,"incident_log_type","accept"));
+        idCache.put(1737L,getDicId(jdbcTemplateHsms,"incident_log_type","receive"));
+        idCache.put(1738L,getDicId(jdbcTemplateHsms,"incident_log_type","doing"));
+        idCache.put(1739L,getDicId(jdbcTemplateHsms,"incident_log_type","resolve"));
+        idCache.put(1740L,getDicId(jdbcTemplateHsms,"incident_log_type","close"));
+        idCache.put(1741L,getDicId(jdbcTemplateHsms,"incident_log_type","reassign"));
+        idCache.put(1742L,getDicId(jdbcTemplateHsms,"incident_log_type","assign"));
+        idCache.put(1743L,getDicId(jdbcTemplateHsms,"incident_log_type","redeploy"));
+        idCache.put(1744L,getDicId(jdbcTemplateHsms,"incident_log_type","upgrade"));
+        idCache.put(1745L,getDicId(jdbcTemplateHsms,"incident_log_type","schassign"));
+        idCache.put(1751L,getDicId(jdbcTemplateHsms,"incident_log_type","overtime"));
+        idCache.put(1752L,getDicId(jdbcTemplateHsms,"incident_log_type","callback"));
+        idCache.put(1753L,getDicId(jdbcTemplateHsms,"incident_log_type","cancel"));
+        idCache.put(1754L,getDicId(jdbcTemplateHsms,"incident_log_type","reject"));
+        idCache.put(1755L,getDicId(jdbcTemplateHsms,"incident_log_type","request"));
+        idCache.put(1766L,getDicId(jdbcTemplateHsms,"incident_log_type","edit"));
+
+        //事件-incident_handleCategory
+        idCache.put(1564L,getDicId(jdbcTemplateHsms,"incident_handle_type","1"));
+        idCache.put(1565L,idCache.get(1564L));
+        idCache.put(1566L,idCache.get(1564L));
+        idCache.put(1567L,idCache.get(1564L));
+        idCache.put(1725L,idCache.get(1564L));
+        idCache.put(1726L,idCache.get(1564L));
+        idCache.put(1727L,idCache.get(1564L));
+        idCache.put(1728L,idCache.get(1564L));
+        if ("xiangyang".equals(appName)) {
+            idCache.put(1740L, idCache.get(1564L));
+        }else {
+            idCache.put(1746L, idCache.get(1564L));
+        }
+
+        //事件日志-repair_type
+        if ("xiangyang".equals(appName)) {
+            idCache.put(1723L,getDicId(jdbcTemplateHsms,"repair_type","1"));
+            idCache.put(1724L,getDicId(jdbcTemplateHsms,"repair_type","2"));
+            idCache.put(1729L,getDicId(jdbcTemplateHsms,"repair_type","ljmale8n"));
+            idCache.put(1730L,getDicId(jdbcTemplateHsms,"repair_type","limalzle"));
+            idCache.put(1731L,getDicId(jdbcTemplateHsms,"repair_type","ljmamxbm"));
+            idCache.put(1739L,getDicId(jdbcTemplateHsms,"repair_type","lr623zun"));
+        }else {
+            idCache.put(1723L,getDicId(jdbcTemplateHsms,"repair_type","1"));
+            idCache.put(1724L,getDicId(jdbcTemplateHsms,"repair_type","2"));
+        }
+
 
         return mapper;
     }

src/main/resources/migration.sql

@@ -75,7 +75,7 @@ ftp 安装
 callSocket 重新配置hsms
 
 
-
+//TODO 系统执行的用户name，改成id 0,启动前：gender -> 279