From 230b90c5c292a15a097cde2b5fb5a30a5bf168a4 Mon Sep 17 00:00:00 2001 From: Cui YongXing <2835316714@qq.com> Date: Sat, 31 Aug 2024 11:17:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/domian/NodeJoint.java | 4 +++ .../com/muyu/common/domian/Structure.java | 2 +- .../server/controller/TaskInfoController.java | 17 ++++++++++ .../task/server/service/TaskInputService.java | 4 +++ .../service/impl/TaskInputServiceImpl.java | 31 +++++++++++++++++++ .../main/resources/mapper/TaskInfoMapper.xml | 7 +++++ 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 cloud-task-server/src/main/resources/mapper/TaskInfoMapper.xml diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/NodeJoint.java b/cloud-task-common/src/main/java/com/muyu/common/domian/NodeJoint.java index da217b0..f531cdd 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/NodeJoint.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/NodeJoint.java @@ -41,5 +41,9 @@ public class NodeJoint { */ private String twoFie; + private String oneNodeId; + + private String twoNodeId; + } diff --git a/cloud-task-common/src/main/java/com/muyu/common/domian/Structure.java b/cloud-task-common/src/main/java/com/muyu/common/domian/Structure.java index 090a3a8..ae02273 100644 --- a/cloud-task-common/src/main/java/com/muyu/common/domian/Structure.java +++ b/cloud-task-common/src/main/java/com/muyu/common/domian/Structure.java @@ -83,7 +83,7 @@ public class Structure extends BaseEntity .columnName(structure.columnName) .columnType(structure.columnType) .isNull(structure.isNull) - .tableAsName(tableAsName+"_"+structure.columnName) + .tableAsName(tableAsName+"."+structure.columnName) .build(); } diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInfoController.java b/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInfoController.java index 9f0d9d5..6eb8183 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInfoController.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/controller/TaskInfoController.java @@ -1,17 +1,23 @@ package com.muyu.task.server.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.common.domian.TaskInfo; +import com.muyu.common.domian.TaskInput; import com.muyu.common.domian.req.TaskInfoAddReq; import com.muyu.common.domian.req.TaskInfoListReq; import com.muyu.common.domian.req.TaskInfoUpdReq; import com.muyu.common.domian.resp.TaskInfoResp; +import com.muyu.task.server.service.NodeJointService; +import com.muyu.task.server.service.NodeTableService; import com.muyu.task.server.service.TaskInfoService; +import com.muyu.task.server.service.TaskInputService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,6 +35,11 @@ public class TaskInfoController { @Autowired private TaskInfoService taskInfoService; + @Autowired + private TaskInputService taskInputService; + + @Autowired + private NodeJointService nodeJointService; /** * 获取所有的任务信息 * @param req @@ -105,5 +116,11 @@ public class TaskInfoController { return Result.success(null,"保存成功"); } + @PostMapping("/execute") + public Result execute(@RequestParam("taskId") Long taskId){ + taskInputService.findByFieName(taskId); + return Result.success(); + } + } diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java index 74e8be8..ed0bbc0 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInputService.java @@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.domian.TaskInput; import com.muyu.common.domian.req.TaskInputListReq; +import java.util.List; + public interface TaskInputService extends IService { Page findList(TaskInputListReq req); + + String findByFieName(Long taskId); } diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java index e3c9e84..e2d1db7 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInputServiceImpl.java @@ -1,17 +1,31 @@ package com.muyu.task.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.domian.TaskInput; import com.muyu.common.domian.req.TaskInputListReq; import com.muyu.task.server.mapper.TaskInputMapper; +import com.muyu.task.server.service.NodeTableService; import com.muyu.task.server.service.TaskInputService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; @Service public class TaskInputServiceImpl extends ServiceImpl implements TaskInputService { + @Autowired + private TaskInputMapper taskInputMapper; + + @Autowired + private NodeTableService tableService; + + @Override public Page findList(TaskInputListReq req) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -20,4 +34,21 @@ public class TaskInputServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("task_id",taskId); + List list = taskInputMapper.selectList(wrapper); + if (CollectionUtils.isEmpty(list)){ + return "没有选择字段"; + } + String fieName=""; + for (int i = 0; i < list.size(); i++) { + fieName+= ","+list.get(i).getTableAsFieId(); + } + fieName = fieName.substring(1); +// tableService.selectTableName(taskId); + return null; + } } diff --git a/cloud-task-server/src/main/resources/mapper/TaskInfoMapper.xml b/cloud-task-server/src/main/resources/mapper/TaskInfoMapper.xml new file mode 100644 index 0000000..992bf4b --- /dev/null +++ b/cloud-task-server/src/main/resources/mapper/TaskInfoMapper.xml @@ -0,0 +1,7 @@ + + + + +