From f3ad332d4baed99e876a9c01734e172dac7f4ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Fri, 30 Aug 2024 22:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/domain/TaskInputInfo.java   |  7 +++++++
 .../java/com/muyu/domain/resp/TaskInputInfoResp.java   |  2 +-
 .../com/muyu/controller/TaskInputInfoController.java   |  1 +
 .../main/java/com/muyu/service/TaskInputService.java   |  1 +
 .../muyu/service/impl/TaskInputInfoServiceImpl.java    | 10 +++++++++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java
index 9bfb41b..7708f32 100644
--- a/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java
+++ b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java
@@ -1,5 +1,6 @@
 package com.muyu.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -72,6 +73,12 @@ public class TaskInputInfo extends BaseEntity {
      */
     private String fieldAsEngineId;
 
+    /**
+     * 选中字段列表
+     */
+    @TableField(exist = false)
+    private List<Structure> columnList;
+
 
 
 
diff --git a/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInputInfoResp.java b/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInputInfoResp.java
index 691bbbf..963733a 100644
--- a/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInputInfoResp.java
+++ b/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInputInfoResp.java
@@ -20,6 +20,6 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class TaskInputInfoResp extends TaskInputInfo {
-    private List<Structure> structureList;
+    private List<Structure> columnList;
 
 }
diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java
index 48ff27a..6a84455 100644
--- a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java
+++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java
@@ -2,6 +2,7 @@ package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.TaskInputInfo;
+import com.muyu.domain.resp.TaskInputInfoResp;
 import com.muyu.service.TaskInputService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java
index 5e74a85..f7b009f 100644
--- a/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java
+++ b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java
@@ -3,6 +3,7 @@ package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.TaskInputInfo;
+import com.muyu.domain.resp.TaskInputInfoResp;
 
 import java.util.List;
 
diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java
index fd37ce7..2245de5 100644
--- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java
@@ -1,15 +1,19 @@
 package com.muyu.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.domain.Structure;
 import com.muyu.domain.TaskInputInfo;
+import com.muyu.domain.resp.TaskInputInfoResp;
 import com.muyu.mapper.TaskInputInfoMapper;
 import com.muyu.service.TaskInputService;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -39,6 +43,10 @@ public class TaskInputInfoServiceImpl extends ServiceImpl<TaskInputInfoMapper, T
     public TaskInputInfo findByNodeId(String nodeId) {
         LambdaQueryWrapper<TaskInputInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaskInputInfo::getNodeId, nodeId);
-        return taskInputInfoMapper.selectOne(queryWrapper);
+        TaskInputInfo taskInputInfo = taskInputInfoMapper.selectOne(queryWrapper);
+        String tableField = taskInputInfo.getTableField();
+        List<Structure> structures = JSON.parseArray(tableField, Structure.class);
+        taskInputInfo.setColumnList(structures);
+        return taskInputInfo;
     }
 }