基本完成数据交换中心所有接口

src/main/java/com/template/common/utils/DBUtil.java

@@ -124,10 +124,10 @@ public class DBUtil {
                 int columnSize = rs.getInt("COLUMN_SIZE");
 
                 tmpMap.put("COLUMN_NAME", columnName);
-                tmpMap.put("TYPE_NAME", columnType);
-                tmpMap.put("REMARKS", columnComment);
-                tmpMap.put("IS_NULLABLE", isNullable);
+                tmpMap.put("COLUMN_TYPE", columnType);
+                tmpMap.put("COLUMN_COMMENT", columnComment);
                 tmpMap.put("COLUMN_SIZE", String.valueOf(columnSize));
+                tmpMap.put("IS_NULLABLE", isNullable);
 
                 list.add(tmpMap);
             }

src/main/java/com/template/common/utils/QuartzJobUtils.java

@@ -52,7 +52,7 @@ public class QuartzJobUtils {
             jobDataMap.put("destinationPassword", dsDestinationInfo.getDsPassword());
             jobDataMap.put("destinationTable", dsDestinationInfo.getDestinationTable().substring(0, dsDestinationInfo.getDestinationTable().indexOf("[")));
 
-            // 字段对应关系
+            // 任务参数
             jobDataMap.put("tkId", smartDataTask.getTkId());
             jobDataMap.put("colRelationship", smartDataTask.getTkColRelationship());
             jobDataMap.put("rsIncorrectData", smartDataTask.getTkRsIncorrectData());

src/main/java/com/template/controller/Task.java

@@ -261,6 +261,7 @@ public class Task extends QuartzJobBean {
         }
     }
 
+    // 保存错误信息
     private void saveErrorMsg(Integer tkId, String datetime, String errorMsg) {
         // 实现错误信息保存的逻辑
         SmartDataTaskErr smartDataTaskErr = new SmartDataTaskErr();
@@ -277,7 +278,6 @@ public class Task extends QuartzJobBean {
             }
         } else {
             smartDataTaskErr.setEId(returnSmartDataTaskErr.getEId());
-            smartDataTaskErr.setENum(returnSmartDataTaskErr.getENum() + 1);
             int i = smartDataTaskMapper.updateErrorMsg(smartDataTaskErr);
             if (i == 0) {
                 System.out.println(datetime + "：更新错误信息失败！");

src/main/java/com/template/mapper/SmartDataTaskMapper.java

@@ -226,10 +226,22 @@ public interface SmartDataTaskMapper extends BaseMapper<SmartDataTask> {
     @Update("UPDATE smart_data_task_err " +
             "SET e_task_id = #{eTaskId} " +
             "    ,e_msg = #{eMsg} " +
-            "    ,e_num = #{eNum} " +
+            "    ,e_num = e_num + 1 " +
             "    ,e_date_time = #{eDateTime} " +
             "WHERE " +
             "    e_id = #{eId} "
     )
     int updateErrorMsg(SmartDataTaskErr smartDataTaskErr);
+
+    @Select({
+            "<script>",
+            "   SELECT " +
+                    "     tk_col_relationship " +
+                    "   FROM smart_data_task ",
+            "   <where>",
+            "      <if test='tkId != null'>AND tk_id = #{tkId}</if> ",
+            "   </where>",
+            "</script>"
+    })
+    String getColRelationship(SmartDataTask smartDataTask);
 }

src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java

@@ -125,7 +125,7 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
             if (smartDataTask.getTkOptCfgRsNum() == null) {
                 return CommonUtil.getReturnMap("1", "【运行参数配置：记录数】不能为空！");
             }
-            if (smartDataTask.getTkOptCfgRsNum() > 100){
+            if (smartDataTask.getTkOptCfgRsNum() > 100) {
                 return CommonUtil.getReturnMap("1", "【运行参数配置：记录数】不能大于100！");
             }
             if (smartDataTask.getTkOptCfgThreadsNum() == null) {
@@ -519,7 +519,7 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
             if (smartDataTask.getTkOptCfgRsNum() == null) {
                 return CommonUtil.getReturnMap("1", "【运行参数配置：记录数】不能为空！");
             }
-            if (smartDataTask.getTkOptCfgRsNum() > 100){
+            if (smartDataTask.getTkOptCfgRsNum() > 100) {
                 return CommonUtil.getReturnMap("1", "【运行参数配置：记录数】不能大于100！");
             }
             if (smartDataTask.getTkOptCfgThreadsNum() == null) {
@@ -577,7 +577,14 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
         int result = smartDataTaskMapper.updateById(smartDataTask);
         if (result > 0) {
             // 获取数据源对应的表、视图、Sql对应的结构
-            return CommonUtil.getReturnMap("0", this.getMetaData(smartDataTask, dsSource, dsDestination, "编辑"));
+            Map<String, Object> returnMap = this.getMetaData(smartDataTask, dsSource, dsDestination, "编辑");
+            if (returnMap.get("code") == null) {
+                // 获取字段对应关系
+                String colRelationship = smartDataTaskMapper.getColRelationship(smartDataTask);
+                JSONArray jsonArray = JSONArray.parseArray(colRelationship);
+                returnMap.put("colRelationship", jsonArray);
+            }
+            return CommonUtil.getReturnMap("0", returnMap);
         } else {
             return CommonUtil.getReturnMap("1", "【编辑任务-任务基本信息】失败！");
         }