From 4db14d49a47a205c4ec8213a6642a7db753fe68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Tue, 27 Aug 2024 14:36:09 +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/TableInfo.java | 2 +- .../muyu/domain/resp/TableInfoCasResp.java | 26 +++++++++++++++++++ .../muyu/controller/TableInfoController.java | 5 ++-- .../com/muyu/service/TableInfoService.java | 3 ++- .../service/impl/TableInfoServiceImpl.java | 19 ++++++++++++-- 5 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/resp/TableInfoCasResp.java diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java index 465a790..e6ef88e 100644 --- a/cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java +++ b/cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java @@ -23,7 +23,7 @@ import java.util.List; @NoArgsConstructor @SuperBuilder public class TableInfo extends BaseEntity { - private String id; + private Integer id; private String basicId; private String tableName; private String tableRemark; diff --git a/cloud-task-common/src/main/java/com/muyu/domain/resp/TableInfoCasResp.java b/cloud-task-common/src/main/java/com/muyu/domain/resp/TableInfoCasResp.java new file mode 100644 index 0000000..9c66fe7 --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/resp/TableInfoCasResp.java @@ -0,0 +1,26 @@ +package com.muyu.domain.resp; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @PackageName:com.muyu.domain.resp + * @ClassName:TableInfoCasResp + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/27 14:24 + */ +@AllArgsConstructor +@NoArgsConstructor +@Data +public class TableInfoCasResp { + + private Integer value; + private String label; + private List children; + + +} diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java b/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java index c169ee2..10ef6a0 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java @@ -2,6 +2,7 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.TableInfo; +import com.muyu.domain.resp.TableInfoCasResp; import com.muyu.domain.resp.TaskInputInfoResp; import com.muyu.service.TableInfoService; import io.swagger.v3.oas.annotations.Operation; @@ -28,9 +29,9 @@ public class TableInfoController { @RequestMapping(path = "/list", method = RequestMethod.GET) @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ，进行模糊查询") - public Result> selectList() { + public Result> selectList() { startPage(); - List taskInputInfos = tableInfoService.selectList(); + List taskInputInfos = tableInfoService.selectList(); return Result.success( taskInputInfos ); diff --git a/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java b/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java index 1e038ec..ec46543 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java +++ b/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java @@ -2,6 +2,7 @@ package com.muyu.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.TableInfo; +import com.muyu.domain.resp.TableInfoCasResp; import com.muyu.domain.resp.TaskInputInfoResp; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; * @date: 2024/8/22 20:18 */ public interface TableInfoService extends IService { - List selectList(); + List selectList(); TableInfo findByTableId(Integer id); } diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java index 7a93455..c8723ce 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java @@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.Structure; import com.muyu.domain.TableInfo; import com.muyu.domain.TaskInputInfo; +import com.muyu.domain.resp.TableInfoCasResp; import com.muyu.domain.resp.TaskInputInfoResp; import com.muyu.mapper.TableInfoMapper; import com.muyu.service.TableInfoService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -24,17 +26,30 @@ import java.util.List; public class TableInfoServiceImpl extends ServiceImpl implements TableInfoService { @Override - public List selectList() { + public List selectList() { + List tableInfoCasResp = new ArrayList<>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(TableInfo::getParentId,0); List list = this.list(queryWrapper); list.forEach(tableInfo -> { + TableInfoCasResp tableInfoCasRespDad = new TableInfoCasResp(); + tableInfoCasRespDad.setValue(tableInfo.getId()); + tableInfoCasRespDad.setLabel(tableInfo.getTableName()); LambdaQueryWrapper queryWrapperC = new LambdaQueryWrapper<>(); queryWrapperC.eq(TableInfo::getParentId,tableInfo.getId()); List list1 = this.list(queryWrapperC); + List tableInfoCasRespSon = new ArrayList<>(); + for (TableInfo info : list1) { + TableInfoCasResp casResp = new TableInfoCasResp(); + casResp.setValue(info.getId()); + casResp.setLabel(info.getTableName()); + tableInfoCasRespSon.add(casResp); + } + tableInfoCasRespDad.setChildren(tableInfoCasRespSon); tableInfo.setTableInfoList(list1); + tableInfoCasResp.add(tableInfoCasRespDad); }); - return list; + return tableInfoCasResp; } @Override