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 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 structureList; + private List 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 queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(TaskInputInfo::getNodeId, nodeId); - return taskInputInfoMapper.selectOne(queryWrapper); + TaskInputInfo taskInputInfo = taskInputInfoMapper.selectOne(queryWrapper); + String tableField = taskInputInfo.getTableField(); + List structures = JSON.parseArray(tableField, Structure.class); + taskInputInfo.setColumnList(structures); + return taskInputInfo; } }