From c83fa72ae1b252a941551151e15dd52ed6426916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Mon, 26 Aug 2024 15:19:05 +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 | 28 +++++----- .../main/java/com/muyu/domain/TableInfo.java | 31 +++++++++++ .../java/com/muyu/domain/TaskInputInfo.java | 2 + cloud-task-server/pom.xml | 9 ++-- .../muyu/controller/StructureController.java | 16 +++--- ...ntroller.java => TableInfoController.java} | 25 ++++----- ...utInfoMapper.java => TableInfoMapper.java} | 3 +- .../com/muyu/service/StructureService.java | 5 +- ...nputService.java => TableInfoService.java} | 8 +-- .../service/impl/StructureServiceImpl.java | 14 ++--- .../service/impl/TableInfoServiceImpl.java | 39 ++++++++++++++ .../service/impl/TaskInputServiceImpl.java | 51 ------------------- 12 files changed, 129 insertions(+), 102 deletions(-) create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java rename cloud-task-server/src/main/java/com/muyu/controller/{TaskInputController.java => TableInfoController.java} (74%) rename cloud-task-server/src/main/java/com/muyu/mapper/{TaskInputInfoMapper.java => TableInfoMapper.java} (64%) rename cloud-task-server/src/main/java/com/muyu/service/{TaskInputService.java => TableInfoService.java} (61%) create mode 100644 cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java delete mode 100644 cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.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 b6f829a..c8d88d0 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,9 +1,8 @@ package com.muyu.domain; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; /** * @PackageName:com.muyu.domain @@ -12,18 +11,23 @@ import lombok.NoArgsConstructor; * @author: ￥陈思豪￥ * @date: 2024/8/23 18:53 */ +@EqualsAndHashCode(callSuper = true) @AllArgsConstructor @NoArgsConstructor @Data -@Builder -public class Structure { +@SuperBuilder +public class Structure extends BaseEntity { private Integer id; - private String fieldName; - private String fieldType; - private String fieldLength; - private String fieldDecimals; + private Integer tableId; + private String columnName; + private String columnRemark; + private String isPrimary; + private String columnType; + private String javaType; + private String columnLength; + private String columnDecimals; private String isNull; - private String isDictionary; private String defaultValue; - + private String isDictionary; + private String dictionaryTable; } 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 new file mode 100644 index 0000000..6213f2e --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/TableInfo.java @@ -0,0 +1,31 @@ +package com.muyu.domain; + +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @PackageName:com.muyu.domain + * @ClassName:TableInfo + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/26 11:38 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class TableInfo extends BaseEntity { + private String id; + private String basicId; + private String tableName; + private String tableRemark; + private String type; + private String dataNum; + private String center; + private String parentId; +} 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 821003c..8c33e5e 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 @@ -23,6 +23,8 @@ import java.util.List; @SuperBuilder public class TaskInputInfo extends BaseEntity { + + private Integer id; /** diff --git a/cloud-task-server/pom.xml b/cloud-task-server/pom.xml index 0a7ac88..c69c063 100644 --- a/cloud-task-server/pom.xml +++ b/cloud-task-server/pom.xml @@ -100,10 +100,13 @@ org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 + maven-compiler-plugin - true + 17 + 17 + + -parameters + 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 index 3b937bc..e6699a9 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/StructureController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/StructureController.java @@ -1,14 +1,11 @@ package com.muyu.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.common.core.domain.Result; 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 org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.List; /** @@ -22,11 +19,12 @@ import java.util.List; @RequestMapping("/structure") public class StructureController { - @Resource + @Autowired private StructureService structureService; - @GetMapping("/findThis") - public String findThis() { - return structureService.findThis(); + @GetMapping("/findStructureList") + public Result> findStructureList(@RequestParam Integer tableId) { + List structureList = structureService.findStructureList(tableId); + return Result.success(structureList); } } diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java b/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java similarity index 74% rename from cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java rename to cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java index 213e141..c169ee2 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/TableInfoController.java @@ -1,15 +1,12 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; -import com.muyu.domain.TaskInputInfo; +import com.muyu.domain.TableInfo; import com.muyu.domain.resp.TaskInputInfoResp; -import com.muyu.service.TaskInputService; +import com.muyu.service.TableInfoService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,17 +20,17 @@ import static com.muyu.common.core.utils.PageUtils.startPage; * @date: 2024/8/22 20:17 */ @RestController -@RequestMapping("/taskInput") -public class TaskInputController { +@RequestMapping("/tableInfo") +public class TableInfoController { @Autowired - private TaskInputService taskInputService; + private TableInfoService tableInfoService; @RequestMapping(path = "/list", method = RequestMethod.GET) @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ，进行模糊查询") - public Result> selectList() { + public Result> selectList() { startPage(); - List taskInputInfos = taskInputService.selectList(); + List taskInputInfos = tableInfoService.selectList(); return Result.success( taskInputInfos ); @@ -44,11 +41,11 @@ public class TaskInputController { * @param id * @return */ - @RequestMapping(path = "/findByInputId/{id}", method = RequestMethod.POST) + @RequestMapping(path = "/findByTableId", method = RequestMethod.POST) @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ，进行模糊查询") - public Result findByInputId(@PathVariable(name = "id") Integer id) { + public Result findByTableId(@RequestParam Integer id) { startPage(); - TaskInputInfoResp taskInfoResp = taskInputService.findByInputId(id); + TableInfo taskInfoResp = tableInfoService.findByTableId(id); return Result.success( taskInfoResp ); diff --git a/cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java b/cloud-task-server/src/main/java/com/muyu/mapper/TableInfoMapper.java similarity index 64% rename from cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java rename to cloud-task-server/src/main/java/com/muyu/mapper/TableInfoMapper.java index 6cd3127..126caa6 100644 --- a/cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java +++ b/cloud-task-server/src/main/java/com/muyu/mapper/TableInfoMapper.java @@ -1,9 +1,10 @@ package com.muyu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.TableInfo; import com.muyu.domain.TaskInputInfo; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface TaskInputInfoMapper extends BaseMapper { +public interface TableInfoMapper 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 index 8ac70f8..20837f0 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/StructureService.java +++ b/cloud-task-server/src/main/java/com/muyu/service/StructureService.java @@ -1,9 +1,10 @@ package com.muyu.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.Structure; +import java.util.List; + public interface StructureService extends IService { - String findThis(); + List findStructureList(Integer tableId); } diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java b/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java similarity index 61% rename from cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java rename to cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java index a19d6dd..1e038ec 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java +++ b/cloud-task-server/src/main/java/com/muyu/service/TableInfoService.java @@ -1,7 +1,7 @@ package com.muyu.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.TaskInputInfo; +import com.muyu.domain.TableInfo; import com.muyu.domain.resp.TaskInputInfoResp; import java.util.List; @@ -13,8 +13,8 @@ import java.util.List; * @author: ￥陈思豪￥ * @date: 2024/8/22 20:18 */ -public interface TaskInputService extends IService { - List selectList(); +public interface TableInfoService extends IService { + List selectList(); - TaskInputInfoResp findByInputId(Integer id); + TableInfo findByTableId(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 index b08283e..4858a02 100644 --- 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 @@ -7,9 +7,7 @@ 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; @@ -25,10 +23,14 @@ import java.util.List; @Service public class StructureServiceImpl extends ServiceImpl implements StructureService { + @Autowired + private StructureMapper structureMapper; + @Override - public String findThis() { - List list = this.list(); - String jsonString = JSONArray.toJSONString(list); - return jsonString; + public List findStructureList(Integer tableId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(Structure::getTableId, tableId); + List structures = structureMapper.selectList(queryWrapper); + return structures; } } 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 new file mode 100644 index 0000000..9f4ef25 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java @@ -0,0 +1,39 @@ +package com.muyu.service.impl; + +import com.alibaba.fastjson.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.TableInfo; +import com.muyu.domain.TaskInputInfo; +import com.muyu.domain.resp.TaskInputInfoResp; +import com.muyu.mapper.TableInfoMapper; +import com.muyu.service.TableInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @PackageName:com.muyu.service + * @ClassName:TaskInputInfoService + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/22 20:18 + */ +@Service +public class TableInfoServiceImpl extends ServiceImpl implements TableInfoService { + + @Override + public List selectList() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } + + @Override + public TableInfo findByTableId(Integer id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TableInfo::getId, id); + return this.getOne(queryWrapper); + } + +} 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 deleted file mode 100644 index a26a93a..0000000 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.muyu.service.impl; - -import com.alibaba.fastjson.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.domain.resp.TaskInputInfoResp; -import com.muyu.mapper.TaskInputInfoMapper; -import com.muyu.service.TaskInputService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @PackageName:com.muyu.service - * @ClassName:TaskInputInfoService - * @Description: - * @author: ￥陈思豪￥ - * @date: 2024/8/22 20:18 - */ -@Service -public class TaskInputServiceImpl extends ServiceImpl implements TaskInputService { - - - @Override - public List selectList() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return this.list(queryWrapper); - } - - @Override - public TaskInputInfoResp findByInputId(Integer id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(TaskInputInfo::getId, id); - TaskInputInfo taskInputInfo = this.getOne(queryWrapper); - String tableField = taskInputInfo.getTableField(); - List structures = JSONArray.parseArray(tableField, Structure.class); - TaskInputInfoResp taskInputInfoResp = new TaskInputInfoResp(); - taskInputInfoResp.setStructureList(structures); - taskInputInfoResp.setId(taskInputInfo.getId()); - taskInputInfoResp.setNodeId(taskInputInfo.getNodeId()); - taskInputInfoResp.setNodeName(taskInputInfo.getNodeName()); - taskInputInfoResp.setTableField(taskInputInfo.getTableField()); - taskInputInfoResp.setTableName(taskInputInfo.getTableName()); - taskInputInfoResp.setTableAsName(taskInputInfo.getTableAsName()); - taskInputInfoResp.setAbleAsField(taskInputInfo.getAbleAsField()); - taskInputInfoResp.setFieldAsEngineId(taskInputInfo.getFieldAsEngineId()); - return taskInputInfoResp; - } -}