From 67c071c99710c3a5f189158c06bbd399f3b299d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 11:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/RemoteTaskService.java | 20 ++++++++-------- .../{TaskQueryDTO.java => TaskQueryVO.java} | 2 +- .../task/api/domain/TaskStatQueryVO.java | 23 +++++++++++++++++++ .../factory/RemoteTaskFallbackFactory.java | 4 ++-- 4 files changed, 36 insertions(+), 13 deletions(-) rename ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/{TaskQueryDTO.java => TaskQueryVO.java} (96%) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java index ae7ec78..9f0bc54 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java @@ -4,7 +4,7 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.task.api.domain.TaskDTO; -import com.ruoyi.task.api.domain.TaskQueryDTO; +import com.ruoyi.task.api.domain.TaskQueryVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.factory.RemoteTaskFallbackFactory; @@ -52,15 +52,15 @@ public interface RemoteTaskService @GetMapping("/task/{taskId}") R getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** - * 查询任务列表 - * - * @param queryDTO 查询条件 - * @param source 请求来源 - * @return 结果 - */ - @PostMapping("/task/list") - R> getTaskList(@RequestBody TaskQueryDTO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +// /** +// * 查询任务列表 +// * +// * @param queryDTO 查询条件 +// * @param source 请求来源 +// * @return 结果 +// */ +// @PostMapping("/task/list") +// R> getTaskList(@RequestBody TaskQueryVO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 更新任务 diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java similarity index 96% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java index 304b318..f509d10 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java @@ -13,7 +13,7 @@ import java.util.Date; * @date 2026-03-06 */ @Data -public class TaskQueryDTO { +public class TaskQueryVO { /** * 任务ID diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index c174bba..5e65f30 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -4,6 +4,7 @@ import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskTypeEnum; +import java.util.Date; import java.util.List; /** @@ -20,6 +21,12 @@ public class TaskStatQueryVO { /** 月份 */ private Integer month; + /** 开始日期 */ + private Date startDate; + + /** 结束日期 */ + private Date endDate; + /** 任务类别 */ private TaskCategoryEnum taskCategory; @@ -51,6 +58,22 @@ public class TaskStatQueryVO { this.month = month; } + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + public TaskCategoryEnum getTaskCategory() { return taskCategory; } diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java index 2e4b4ef..43ae5ef 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java @@ -3,7 +3,7 @@ package com.ruoyi.task.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.task.api.RemoteTaskService; import com.ruoyi.task.api.domain.TaskDTO; -import com.ruoyi.task.api.domain.TaskQueryDTO; +import com.ruoyi.task.api.domain.TaskQueryVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; import org.slf4j.Logger; @@ -48,7 +48,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory> getTaskList(TaskQueryDTO queryDTO, String source) { + public R> getTaskList(TaskQueryVO queryDTO, String source) { return R.ok(Collections.emptyList()); }