From 4bacae55ad148508dfafca77bb28e3fdf2089237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 25 Aug 2024 09:43:40 +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 --- .../main/java/com/muyu/domain/Structure.java | 9 +++++ .../java/com/muyu/domain/TaskInputInfo.java | 4 +-- .../muyu/controller/StructureController.java | 32 +++++++++++++++++ .../muyu/controller/TaskInputController.java | 18 +++++++--- .../java/com/muyu/mapper/StructureMapper.java | 16 +++++++++ .../com/muyu/service/StructureService.java | 9 +++++ .../com/muyu/service/TaskInputService.java | 5 ++- .../service/impl/StructureServiceImpl.java | 34 +++++++++++++++++++ .../service/impl/TaskInputServiceImpl.java | 14 +++++++- .../src/main/resources/bootstrap.yml | 2 +- 10 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 cloud-task-server/src/main/java/com/muyu/controller/StructureController.java create mode 100644 cloud-task-server/src/main/java/com/muyu/mapper/StructureMapper.java create mode 100644 cloud-task-server/src/main/java/com/muyu/service/StructureService.java create mode 100644 cloud-task-server/src/main/java/com/muyu/service/impl/StructureServiceImpl.java diff --git a/cloud-task-common/src/main/java/com/muyu/domain/Structure.java b/cloud-task-common/src/main/java/com/muyu/domain/Structure.java index 70a4ac3..b6f829a 100644 --- a/cloud-task-common/src/main/java/com/muyu/domain/Structure.java +++ b/cloud-task-common/src/main/java/com/muyu/domain/Structure.java @@ -1,5 +1,10 @@ package com.muyu.domain; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @PackageName:com.muyu.domain * @ClassName:aaA @@ -7,6 +12,10 @@ package com.muyu.domain; * @author: ￥陈思豪￥ * @date: 2024/8/23 18:53 */ +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder public class Structure { private Integer id; private String fieldName; 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 06df4a1..d0a8efb 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 @@ -41,7 +41,7 @@ public class TaskInputInfo extends BaseEntity { /** * 数据库id */ - private Integer databaseId; + private String databaseId; /** * 表名称 @@ -56,7 +56,7 @@ public class TaskInputInfo extends BaseEntity { /** * 表字段 */ - private String[] tableField; + private String tableField; /** * 表字段别名 diff --git a/cloud-task-server/src/main/java/com/muyu/controller/StructureController.java b/cloud-task-server/src/main/java/com/muyu/controller/StructureController.java new file mode 100644 index 0000000..3b937bc --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/controller/StructureController.java @@ -0,0 +1,32 @@ +package com.muyu.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.domain.Structure; +import com.muyu.service.StructureService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @PackageName:com.muyu.controller + * @ClassName:TextController + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/24 20:45 + */ +@RestController +@RequestMapping("/structure") +public class StructureController { + + @Resource + private StructureService structureService; + + @GetMapping("/findThis") + public String findThis() { + return structureService.findThis(); + } +} diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java index 3272081..979df4a 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java @@ -1,6 +1,7 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; +import com.muyu.domain.Structure; import com.muyu.domain.TaskInfo; import com.muyu.domain.TaskInputInfo; import com.muyu.service.TaskInputService; @@ -28,17 +29,26 @@ public class TaskInputController { @Autowired private TaskInputService taskInputService; - @RequestMapping(path = "/list", method = RequestMethod.POST) + @RequestMapping(path = "/list", method = RequestMethod.GET) @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ，进行模糊查询") - public Result> selectList( - @Validated @RequestBody TaskInfo taskInfo) { + public Result> selectList() { startPage(); - List taskInputInfos = taskInputService.selectList(taskInfo); + List taskInputInfos = taskInputService.selectList(); return Result.success( taskInputInfos ); } + @RequestMapping(path = "/findByInputId/{id}", method = RequestMethod.POST) + @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ，进行模糊查询") + public Result> findByInputId(@PathVariable(name = "id") Integer id) { + startPage(); + List taskInputInfo = taskInputService.findByInputId(id); + return Result.success( + taskInputInfo + ); + } + // /** // * 添加新任务 diff --git a/cloud-task-server/src/main/java/com/muyu/mapper/StructureMapper.java b/cloud-task-server/src/main/java/com/muyu/mapper/StructureMapper.java new file mode 100644 index 0000000..e2bff3e --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/mapper/StructureMapper.java @@ -0,0 +1,16 @@ +package com.muyu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.Structure; +import org.apache.ibatis.annotations.Mapper; + +/** + * @PackageName:com.muyu.mapper + * @ClassName:StructureMapper + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/24 20:48 + */ +@Mapper +public interface StructureMapper extends BaseMapper { +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/StructureService.java b/cloud-task-server/src/main/java/com/muyu/service/StructureService.java new file mode 100644 index 0000000..8ac70f8 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/StructureService.java @@ -0,0 +1,9 @@ +package com.muyu.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.Structure; + +public interface StructureService extends IService { + String findThis(); +} 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 2f3fb53..2deb58f 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 @@ -1,6 +1,7 @@ package com.muyu.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.Structure; import com.muyu.domain.TaskInfo; import com.muyu.domain.TaskInputInfo; @@ -14,5 +15,7 @@ import java.util.List; * @date: 2024/8/22 20:18 */ public interface TaskInputService extends IService { - List selectList(TaskInfo taskInfo); + List selectList(); + + List findByInputId(Integer id); } diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/StructureServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/StructureServiceImpl.java new file mode 100644 index 0000000..b08283e --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/StructureServiceImpl.java @@ -0,0 +1,34 @@ +package com.muyu.service.impl; + +import cn.hutool.json.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.domain.Structure; +import com.muyu.domain.TaskInputInfo; +import com.muyu.mapper.StructureMapper; +import com.muyu.mapper.TaskInputInfoMapper; +import com.muyu.service.StructureService; +import com.muyu.service.TaskInputService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @PackageName:com.muyu.service.impl + * @ClassName:StructureServiceImpl + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/24 20:48 + */ +@Service +public class StructureServiceImpl extends ServiceImpl implements StructureService { + + @Override + public String findThis() { + List list = this.list(); + String jsonString = JSONArray.toJSONString(list); + return jsonString; + } +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java index f4b4932..38f4ad7 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java @@ -1,9 +1,12 @@ package com.muyu.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.Structure; import com.muyu.domain.TaskInfo; import com.muyu.domain.TaskInputInfo; import com.muyu.mapper.TaskInputInfoMapper; @@ -27,8 +30,17 @@ public class TaskInputServiceImpl extends ServiceImpl selectList(TaskInfo taskInfo) { + public List selectList() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); return this.list(queryWrapper); } + + @Override + public List findByInputId(Integer id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + TaskInputInfo taskInputInfo = this.getOne(queryWrapper); + String tableField = taskInputInfo.getTableField(); + List structures = JSONArray.parseArray(tableField, Structure.class); + return structures; + } } diff --git a/cloud-task-server/src/main/resources/bootstrap.yml b/cloud-task-server/src/main/resources/bootstrap.yml index 40749aa..ed6aa9a 100644 --- a/cloud-task-server/src/main/resources/bootstrap.yml +++ b/cloud-task-server/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.116.184.54:8848 user-name: nacos password: nacos - namespace: cloud-2112 + namespace: text # Spring spring: