修改

src/main/java/com/dashitech/migration/task/category/IncidentCategoryConfigTask.java

@@ -41,17 +41,21 @@ public class IncidentCategoryConfigTask extends BaseTask {
     @Transactional(rollbackFor = Exception.class)
     public void start() {
         StringBuffer sql = new StringBuffer("SELECT a.version,a.category_id,b._priority as priority,a.duty_id,a.branch_user_group_type as user_group,a.group_id,");
-        sql.append("a.user_id,NOW() as add_time,a.branch_id as hos_id FROM itsm_incident_category_usergroup a ");
-        sql.append(" JOIN itsm_incident_category b ON a.category_id = b.id");
+        sql.append("a.user_id,NOW() as add_time,IF(a.branch_id=4,3,a.branch_id) as hos_id FROM itsm_incident_category_usergroup a ");
+        sql.append(" JOIN itsm_incident_category b ON a.category_id = b.id where a.duty_id is not null ");
         if ("xiangyang".equals(appName)) {
-            sql.append(" WHERE a.branch_id <> 4 ");
+            sql.append(" and a.duty_id not in (4,5,6,13,15,19,20,21) ");
         }
         List<Map<String, Object>> categoryConfigList = jdbcTemplateMdv2.queryForList(sql.toString());
-        //查询故障现象表的配置数据
-        sql = new StringBuffer("select version,id as category_id,_priority as priority,_group as group_id,userOrGroupType as user_group,handle_user as user_id,");
-        sql.append("NOW() as add_time,branch_id as hos_id,duty_dept as duty_id FROM itsm_incident_category");
+        //查询故障现象表的配置数据 组数据 信息中心
+        sql = new StringBuffer("select a.version,a.id as category_id,_priority as priority,b.id as duty_id,userOrGroupType as user_group,_group as group_id,");
+        sql.append("handle_user as user_id,NOW() as add_time,c.id as hos_id FROM itsm_incident_category a ");
         if ("xiangyang".equals(appName)) {
-            sql.append(" WHERE branch_id <> 4 ");
+            sql.append(" join itsm_uc_duty_dept b join itsm_uc_branch c ");
+        }
+        sql.append(" where`branch_type` = '0' and duty_dept in (2,8,11) AND a.delete_flag = 0 ");
+        if ("xiangyang".equals(appName)) {
+            sql.append(" and b.id in (11) and c.id in (1,2,3)");
         }
         List<Map<String, Object>> list = jdbcTemplateMdv2.queryForList(sql.toString());
         categoryConfigList.addAll(list);
@@ -66,6 +70,10 @@ public class IncidentCategoryConfigTask extends BaseTask {
 
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
         jdbcUtil.batchPageInsert("itsm_itsm_incident_category_config", mapper.getRows());
+
+        //当院区为空时 将责任科室父级院区赋值
+        StringBuffer upSql = new StringBuffer("update `itsm_itsm_incident_category_config` a,itsm_uc_hospital b set hos_id = b.parentId where a.duty_id = b.id and a.hos_id is null ");
+        jdbcTemplateHsms.execute(upSql.toString());
         mapper.clear();
     }
 

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

@@ -2,7 +2,6 @@ package com.dashitech.migration.task.incident;
 
 import com.dashitech.migration.BaseTask;
 import com.dashitech.migration.SqlTask;
-import com.dashitech.migration.core.DataMigrationter;
 import com.dashitech.migration.core.FieldMapper;
 import com.dashitech.migration.util.JdbcUtil;
 import org.apache.commons.logging.Log;
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by CX on 2024/10/10.
@@ -40,21 +38,20 @@ public class IncidentAssignManagerTask extends BaseTask {
         log.info(" *** IncidentAssignManagerTask start 开始 *** ");
 
         StringBuffer sb = new StringBuffer();
-        sb.append(" select * from itsm_incident_assign_manager ");
+        sb.append("SELECT version,dept_id,category_id,handle_user,IFNULL(_group,b.group_id) as handle_group,add_time,");
+        sb.append("a.duty_id as hos_id,batch_id as batch_no  FROM `itsm_incident_assign_manager` a left join ");
+        sb.append("(select a.user_id,a.group_id,b.duty_id from itsm_uc_user_group a join itsm_uc_groups b on a.group_id = b.id ) b ");
+        sb.append("on a.handle_user = b.user_id and a.duty_id = b.duty_id");
 
         List list = jdbcTemplateMdv2.queryForList(sb.toString());
 
         FieldMapper mapper = new FieldMapper();
-        mapper.addOperationRemove("id").addOperationRemove("userOrGroupType").addOperationRemove("branch_id");
-        mapper.addOperationUpdate("handle_group", "_group");
-        mapper.addOperationUpdate("batch_no", "batch_id");
-        mapper.addOperationUpdate("hos_id", "duty_id");
-        mapper.addOperationReplace("duty_id", hospitalTask.loadCache().getIdCache());
+        mapper.addOperationReplace("hos_id", hospitalTask.loadCache().getIdCache());
         if ("xiangyang".equals(appName)) {
             mapper.addOperationReplace("dept_id", departmentTask.loadCache().getIdCache());
         }
         mapper.addOperationReplace("handle_user", userTask.loadCache().getIdCache());
-        mapper.addOperationReplace("_group", groupTask.loadCache().getIdCache());
+        mapper.addOperationReplace("handle_group", groupTask.loadCache().getIdCache());
         mapper.trans2JdbcRow(list);
 
         JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);

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

@@ -58,7 +58,7 @@ public class IncidentTask extends BaseTask {
         mapper.addOperationUpdate("hos_id", "branch_id");
         //襄阳id4-
         mapper.addOperationReplace("userid", userCache);
-        mapper.addOperationReplace("close_userid", dicCache);
+        mapper.addOperationReplace("close_userid", userCache);
         mapper.addOperationReplace("close_codeid", dicCache);
         mapper.addOperationReplace("degreeid", dicCache);
         mapper.addOperationReplace("priorityid", dicCache);

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

@@ -52,6 +52,12 @@ public class DepartmentTask extends BaseTask {
             jdbcUtil.batchPageInsert("itsm_uc_dept", rw.getInsertRows());
             jdbcUtil.batchPageUpdate("itsm_uc_dept", rw.getUpdateRows());
 
+            if ("xiangyang".equals(appName)) {
+                //修改总测试科室id=1
+                String upSql = " update itsm_uc_dept SET id = 1 where code = 'zongceshikeshi'";
+                jdbcTemplateHsms.execute(upSql);
+            }
+
             mapper.clear();
             deptMapper.clear();
         }

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

@@ -40,12 +40,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,GENDER,NAME,PHONE,PWD,WEIXIN,DEPTID,delete_flag, ");
         sb.append(" pinyin,py as 'input_code',online, ");
         if ("xiangyang".equals(appName)) {
-            sb.append("IF(branch_id == 4 or branch_id is null,3,branch_id)  as 'hospital_id',");
+            sb.append("IF(branch_id = 4 or branch_id is null,3,branch_id)  as 'hospital_id',");
+            sb.append("case when ACCOUNT = '80185' then 'DuBinBin' when ACCOUNT = '001550' then '1550' ");
+            sb.append("when ACCOUNT = '001551' then '1551' when ACCOUNT = '001552' then '1552' ");
+            sb.append("when ACCOUNT in ('0011769','001769') then '1769' when ACCOUNT in ('0015667','015667','005667') then '5667' ");
+            sb.append("when ACCOUNT in('001811','00001811','0011811','01811') then '1811' else ACCOUNT end as ACCOUNT,");
         } else {
-            sb.append("duty_id as 'hospital_id',");
+            sb.append("duty_id as 'hospital_id',ACCOUNT,");
         }
         sb.append(" duty_id as 'duty_dept',company as 'company_id',engineer ");
         sb.append(" from itsm_uc_user ");
@@ -55,12 +59,13 @@ public class UserTask extends BaseTask {
 
         FieldMapper mapper = new FieldMapper();
         mapper.addOperationAdd("usertype", getDicId(jdbcTemplateHsms,"usertype","4")); //用户类型-默认三方人员
-        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());
+        } else {
+            mapper.addOperationReplace("hospital_id", hospitalTask.loadCache().getIdCache());
         }
         mapper.trans2JdbcRow(list);
 
@@ -71,12 +76,24 @@ public class UserTask extends BaseTask {
         List<JdbcRow> updateRows = rw.getUpdateRows();
         //过滤微信不为空的数据做更新处理
         updateRows = updateRows.stream().filter(s -> s.getRow().get("WEIXIN") != null).collect(Collectors.toList());
+        //筛选出运维人员做更新
+        updateRows = updateRows.stream().filter(s -> s.getRow().get("engineer") != null && "1".equals(s.getRow().get("engineer").toString())).collect(Collectors.toList());
         jdbcUtil.batchPageUpdate("itsm_uc_user", updateRows);
 
         //性别有null的
         String sql = " update itsm_uc_user SET GENDER = (SELECT id from itsm_base_dictionary WHERE _key = 'user_gender' and _value = '0' ) WHERE GENDER is null ";
         jdbcTemplateHsms.execute(sql);
 
+        if ("xiangyang".equals(appName)) {
+            //襄阳删除运维人员的护士角色
+            sql = "DELETE from itsm_uc_user_role where user_id in (select id from itsm_uc_user where usertype = (select id from itsm_base_dictionary where _key = 'usertype' and _value = '4')) and role_id = 3";
+            jdbcTemplateHsms.execute(sql);
+
+            //修改运维人员账号为默认密码
+            sql = "update itsm_uc_user set PWD = '21218CCA77804D2BA1922C33E0151105' where usertype = (select id from itsm_base_dictionary where _key = 'usertype' and _value = '4') ";
+            jdbcTemplateHsms.execute(sql);
+        }
+
         //clear释放内存
         mapper.clear();
         userMapper.clear();