From 0b8ffdafae47b42ed4e5ee505a6cef6eac40cea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sat, 24 Aug 2024 18:50:19 +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 | 20 ++++++++ .../java/com/muyu/domain/TaskInputInfo.java | 6 +-- .../java/com/muyu/domain/req/TaskInfoReq.java | 48 +++++++++++++++++++ .../com/muyu/domain/resp/TaskInfoResp.java | 16 +++++++ .../com/muyu/controller/TaskController.java | 5 +- .../muyu/controller/TaskInputController.java | 3 +- .../java/com/muyu/service/TaskService.java | 3 +- .../muyu/service/impl/TaskServiceImpl.java | 16 ++++--- .../src/main/resources/bootstrap.yml | 2 +- 9 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/Structure.java create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInfoResp.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 new file mode 100644 index 0000000..70a4ac3 --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/Structure.java @@ -0,0 +1,20 @@ +package com.muyu.domain; + +/** + * @PackageName:com.muyu.domain + * @ClassName:aaA + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/23 18:53 + */ +public class Structure { + private Integer id; + private String fieldName; + private String fieldType; + private String fieldLength; + private String fieldDecimals; + private String isNull; + private String isDictionary; + private String defaultValue; + +} 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 a0b66ff..06df4a1 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 @@ -56,16 +56,16 @@ public class TaskInputInfo extends BaseEntity { /** * 表字段 */ - private Integer tableField; + private String[] tableField; /** * 表字段别名 */ - private String ableAsField; + private String[] ableAsField; /** * 字段规则 */ - private String fieldAsEngineId; + private String[] fieldAsEngineId; } diff --git a/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java b/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java new file mode 100644 index 0000000..2939261 --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java @@ -0,0 +1,48 @@ +package com.muyu.domain.req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @PackageName:com.muyu.domain.req + * @ClassName:TaskInforeq + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/23 10:49 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TaskInfoReq { + + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + + /** + * 任务名称 + */ + private String name; + + /** + * 任务优先级 + */ + private Integer weigh; + + /** + * 任务状态 + */ + private Integer status; + + + private Integer pageNum=1; + + private Integer pageSize=5; +} diff --git a/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInfoResp.java b/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInfoResp.java new file mode 100644 index 0000000..8fe066a --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/resp/TaskInfoResp.java @@ -0,0 +1,16 @@ +package com.muyu.domain.resp; + +import lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * @PackageName:com.muyu.domain.resp + * @ClassName:TaskInfoResp + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/23 10:48 + */ +public class TaskInfoResp { + + +} diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java index 7558ad3..186bbcc 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java @@ -4,6 +4,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.domain.TaskInfo; +import com.muyu.domain.req.TaskInfoReq; import com.muyu.service.TaskService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; @@ -33,10 +34,10 @@ public class TaskController { @RequestMapping(path = "/list", method = RequestMethod.POST) @Operation(summary = "查看指定任务", description = "根据任务的名称或者状态 ，进行模糊查询") public Result> selectList( - @Validated @RequestBody TaskInfo taskInfo) { + @Validated @RequestBody TaskInfoReq taskInfoReq) { startPage(); return Result.success( - taskService.selectList(taskInfo) + taskService.selectList(taskInfoReq) ); } 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 e966226..3272081 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 @@ -33,8 +33,9 @@ public class TaskInputController { public Result> selectList( @Validated @RequestBody TaskInfo taskInfo) { startPage(); + List taskInputInfos = taskInputService.selectList(taskInfo); return Result.success( - taskInputService.selectList(taskInfo) + taskInputInfos ); } diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskService.java b/cloud-task-server/src/main/java/com/muyu/service/TaskService.java index e48ccb5..c6ca08a 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/TaskService.java +++ b/cloud-task-server/src/main/java/com/muyu/service/TaskService.java @@ -2,6 +2,7 @@ package com.muyu.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.TaskInfo; +import com.muyu.domain.req.TaskInfoReq; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * @date: 2024/8/22 17:15 */ public interface TaskService extends IService { - List selectList(TaskInfo taskInfo); + List selectList(TaskInfoReq taskInfoReq); String addTask(TaskInfo taskInfo); diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java index a6aa412..ee0364f 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -7,6 +7,7 @@ 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.domain.TaskInfo; +import com.muyu.domain.req.TaskInfoReq; import com.muyu.mapper.TaskMapper; import com.muyu.service.TaskService; import io.swagger.v3.oas.annotations.Operation; @@ -33,20 +34,21 @@ public class TaskServiceImpl extends ServiceImpl implement @Override - public List selectList(TaskInfo taskInfo) { + public List selectList(TaskInfoReq taskInfoReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like( - StringUtils.isNotEmpty(taskInfo.getName()), - TaskInfo::getName, taskInfo.getName() + StringUtils.isNotEmpty(taskInfoReq.getName()), + TaskInfo::getName, taskInfoReq.getName() ); - if(taskInfo.getStatus()!=null && taskInfo.getStatus()!=0){ + if(taskInfoReq.getStatus()!=null && taskInfoReq.getStatus()!=0){ queryWrapper.eq( - TaskInfo::getStatus,taskInfo.getStatus() + TaskInfo::getStatus,taskInfoReq.getStatus() ); } - if(taskInfo.getWeigh()!=null && taskInfo.getWeigh()!=0 ){ + if(taskInfoReq.getWeigh()!=null && taskInfoReq.getWeigh()!=0 ){ queryWrapper.eq( - TaskInfo::getWeigh,taskInfo.getWeigh() + TaskInfo::getWeigh,taskInfoReq.getWeigh() ); } return this.list(queryWrapper); 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: