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 9e3f47f..e966226 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,15 +1,19 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; +import com.muyu.domain.TaskInfo; import com.muyu.domain.TaskInputInfo; -import com.muyu.service.TaskInputInfoService; +import com.muyu.service.TaskInputService; +import com.muyu.service.TaskService; +import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.muyu.common.core.utils.PageUtils.startPage; + /** * @PackageName:com.muyu.controller * @ClassName:TaskInputController @@ -22,10 +26,51 @@ import java.util.List; public class TaskInputController { @Autowired - private TaskInputInfoService taskInputInfoService; + private TaskInputService taskInputService; -// @PostMapping("/selectAll") -// public Result> selectAll(@RequestBody List taskInputInfos) { -// return Result.success(taskInputInfoService.); + @RequestMapping(path = "/list", method = RequestMethod.POST) + @Operation(summary = "查看任务节点详情", description = "根据任务的名称或者状态 ,进行模糊查询") + public Result> selectList( + @Validated @RequestBody TaskInfo taskInfo) { + startPage(); + return Result.success( + taskInputService.selectList(taskInfo) + ); + } + + +// /** +// * 添加新任务 +// */ +// @RequestMapping(path = "/addTask", method = RequestMethod.POST) +// @Operation(summary = "添加任务", description = "根据传来的数据进行任务添加") +// public Result addTask( +// @Validated @RequestBody TaskInfo taskInfo) { +// +// return Result.success(taskService.addTask(taskInfo),"添加成功"); // } +// +// /** +// * 修改任务信息 +// */ +// @RequestMapping(path = "/updateById", method = RequestMethod.POST) +// @Operation(summary = "对指定任务进行修改", description = "根据传来的数据进行相应的修改") +// public Result updateById( +// @Validated @RequestBody TaskInfo taskInfo) { +// return Result.success( +// taskService.updById(taskInfo),"修改成功" +// ); +// } +// +// /** +// * 删除任务 +// */ +// @RequestMapping(path = "/deleteById/{id}", method = RequestMethod.POST) +// @Operation(summary = "对指定任务进行删除", description = "根据传来的id进行删除") +// public Result deleteById(@PathVariable(name = "id") Integer id) { +// return Result.success( +// taskService.deleteById(id), "删除成功" +// ); +// } + } diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskInputInfoService.java b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java similarity index 60% rename from cloud-task-server/src/main/java/com/muyu/service/TaskInputInfoService.java rename to cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java index 99db421..2f3fb53 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/TaskInputInfoService.java +++ b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java @@ -1,8 +1,11 @@ package com.muyu.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.TaskInfo; import com.muyu.domain.TaskInputInfo; +import java.util.List; + /** * @PackageName:com.muyu.service * @ClassName:TaskInputInfoService @@ -10,5 +13,6 @@ import com.muyu.domain.TaskInputInfo; * @author: ¥陈思豪¥ * @date: 2024/8/22 20:18 */ -public interface TaskInputInfoService extends IService { +public interface TaskInputService extends IService { + List selectList(TaskInfo taskInfo); } diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java similarity index 53% rename from cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java rename to cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java index 6862ff7..f4b4932 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputServiceImpl.java @@ -1,16 +1,20 @@ package com.muyu.service.impl; +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.TaskInfo; import com.muyu.domain.TaskInputInfo; import com.muyu.mapper.TaskInputInfoMapper; import com.muyu.mapper.TaskMapper; -import com.muyu.service.TaskInputInfoService; +import com.muyu.service.TaskInputService; import com.muyu.service.TaskService; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Service; +import java.util.List; + /** * @PackageName:com.muyu.service * @ClassName:TaskInputInfoService @@ -19,8 +23,12 @@ import org.springframework.stereotype.Service; * @date: 2024/8/22 20:18 */ @Service -public class TaskInputInfoServiceImpl extends ServiceImpl implements TaskInputInfoService { - +public class TaskInputServiceImpl extends ServiceImpl implements TaskInputService { + @Override + public List selectList(TaskInfo taskInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } } 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 a1f3844..000ecbe 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 @@ -39,6 +39,14 @@ public class TaskServiceImpl extends ServiceImpl implement StringUtils.isNotEmpty(taskInfo.getName()), TaskInfo::getName, taskInfo.getName() ); + queryWrapper.ne(TaskInfo::getStatus, 0); + queryWrapper.eq( + TaskInfo::getStatus,taskInfo.getStatus() + ); + queryWrapper.ne(TaskInfo::getWeigh, 0); + queryWrapper.eq( + TaskInfo::getStatus,taskInfo.getWeigh() + ); return this.list(queryWrapper); }