各种bug

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

@@ -28,6 +28,8 @@ public class StartApplication {
 //        task.start();
 //        task = SpringContextHolder.getBean("attachmentTask");
 //        task.start();
+//        task = SpringContextHolder.getBean("opLogTask");
+//        task.start();
 //        task = SpringContextHolder.getBean("hospitalTask");
 //        task.start();
 //        task = SpringContextHolder.getBean("hospitalConfigTask");
@@ -38,8 +40,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/core/DataMapper.java

@@ -24,6 +24,7 @@ public class DataMapper implements Serializable{
     private boolean update = false;
     private boolean add = false;
     private boolean replace = false;
+    private boolean nullDefault = false;
 
     /**
      * 匹配完成后的id对照，source:target
@@ -38,6 +39,14 @@ public class DataMapper implements Serializable{
         this.sourceName = sourceName;
     }
 
+    public boolean isNullDefault() {
+        return nullDefault;
+    }
+
+    public void setNullDefault(boolean nullDefault) {
+        this.nullDefault = nullDefault;
+    }
+
     public boolean isAdd() {
         return add;
     }

src/main/java/com/dashitech/migration/core/FieldMapper.java

@@ -57,6 +57,13 @@ public class FieldMapper {
                     if (dataMapper.isAdd()) {
                         row.put(dataMapper.getSourceName(), dataMapper.getTargetValue());
                     }
+                    //如果是null默认值，判断后put
+                    if (dataMapper.isNullDefault()) {
+                        Object value = row.get(dataMapper.getTargetName());
+                        if(value == null) {
+                            row.put(dataMapper.getTargetName(), dataMapper.getTargetValue());
+                        }
+                    }
                     //如果是要替换的，使用id缓存替换
                     if (dataMapper.isReplace() && row.containsKey(dataMapper.getSourceName())) {
                         Object value = row.get(dataMapper.getSourceName());
@@ -124,6 +131,17 @@ public class FieldMapper {
     }
 
     /**
+     * 字段是null的默认值
+     */
+    public FieldMapper addOperationNull(String target, Object value) {
+        DataMapper mapper = new DataMapper(target, target);
+        mapper.setNullDefault(true);
+        mapper.setTargetValue(value);
+        rowsOperationList.add(mapper);
+        return this;
+    }
+
+    /**
      * 待替换的字段，每次加入都在队列最前面。注意：如果是loadCache过滤，使用target名称，如果是start转换，使用source名称
      */
     public FieldMapper addOperationReplace(String name, Map<Long, Long> idCache) {

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

@@ -46,6 +46,7 @@ public class IncidentLogTask extends BaseTask {
         Map<Long, Long> userCache = userTask.loadCache().getIdCache();
         mapper.addOperationUpdate("hos_id", "branch_id");
         mapper.addOperationReplace("log_type", dictionaryTask.loadCache().getIdCache());
+        mapper.addOperationReplace("next_log_type", dictionaryTask.loadCache().getIdCache());
         mapper.addOperationReplace("appointor_id", userCache);
         mapper.addOperationReplace("worker_id", userCache);
         mapper.addOperationReplace("group_id", groupTask.loadCache().getIdCache());

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

@@ -0,0 +1,55 @@
+package com.dashitech.migration.task.other;
+
+import com.dashitech.migration.BaseTask;
+import com.dashitech.migration.SqlTask;
+import com.dashitech.migration.core.FieldMapper;
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by CX on 2024/10/10.
+ */
+@Component
+public class OpLogTask extends BaseTask {
+
+    public static Log log = LogFactory.getLog(OpLogTask.class);
+
+    @Autowired
+    SqlTask dictionaryTask;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void start() {
+        log.info(" *** TokenTask start开始 *** ");
+        StringBuffer sql = new StringBuffer("select * from itsm_base_operation_log where op_type = 'handlerLog' ");
+        List<Map<String, Object>> tokenList = jdbcTemplateMdv2.queryForList(sql.toString());
+
+        FieldMapper mapper = new FieldMapper();
+        mapper.addOperationRemove("id").addOperationRemove("repair_type").addOperationRemove("expected_day");
+        mapper.addOperationUpdate("hos_id", "branch_id");
+        mapper.trans2JdbcRow(tokenList);
+
+        JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
+        jdbcUtil.batchPageInsert("itsm_base_operation_log", mapper.getRows());
+
+        //clear释放内存
+        mapper.clear();
+    }
+
+    @Override
+    public FieldMapper loadCache() {
+        log.info(" *** AttachmentTask loadCache开始 *** ");
+
+
+        return null;
+    }
+
+
+}

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

@@ -27,6 +27,8 @@ public class UserTask extends BaseTask {
     SqlTask hospitalTask;
     @Autowired
     SqlTask departmentTask;
+    @Autowired
+    SqlTask dictionaryTask;
 
     public static Log log = LogFactory.getLog(UserTask.class);
 
@@ -48,6 +50,7 @@ public class UserTask extends BaseTask {
         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());
         if ("xiangyang".equals(appName)) {
             mapper.addOperationReplace("DEPTID", departmentTask.loadCache().getIdCache());
         }
@@ -62,6 +65,10 @@ public class UserTask extends BaseTask {
         updateRows = updateRows.stream().filter(s -> s.getRow().get("WEIXIN") != null).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);
+
         //clear释放内存
         mapper.clear();
         userMapper.clear();