THENG
/
a-cloud-all
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改对象

This commit is contained in:
孙小云 2026-03-13 11:44:07 +08:00
parent aae9c3537e
commit 67c071c997
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java
View File

@ -4,7 +4,7 @@ import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.task.api.domain.TaskDTO; 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.domain.TaskTempVO;
import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.factory.RemoteTaskFallbackFactory; import com.ruoyi.task.api.factory.RemoteTaskFallbackFactory;
@ -52,15 +52,15 @@ public interface RemoteTaskService
@GetMapping("/task/{taskId}") @GetMapping("/task/{taskId}")
R<TaskDTO> getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); R<TaskDTO> getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** // /**
* 查询任务列表 // * 查询任务列表
* // *
* @param queryDTO 查询条件 // * @param queryDTO 查询条件
* @param source 请求来源 // * @param source 请求来源
* @return 结果 // * @return 结果
*/ // */
@PostMapping("/task/list") // @PostMapping("/task/list")
R<List<TaskDTO>> getTaskList(@RequestBody TaskQueryDTO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); // R<List<TaskDTO>> getTaskList(@RequestBody TaskQueryVO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** /**
* 更新任务 * 更新任务

2
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java → ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
* @date 2026-03-06 * @date 2026-03-06
*/ */
@Data @Data
public class TaskQueryDTO { public class TaskQueryVO {
/** /**
* 任务ID * 任务ID

23
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskCategoryEnum;
import com.ruoyi.task.api.enums.TaskTypeEnum; import com.ruoyi.task.api.enums.TaskTypeEnum;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -20,6 +21,12 @@ public class TaskStatQueryVO {
/** 月份 */ /** 月份 */
private Integer month; private Integer month;
/** 开始日期 */
private Date startDate;
/** 结束日期 */
private Date endDate;
/** 任务类别 */ /** 任务类别 */
private TaskCategoryEnum taskCategory; private TaskCategoryEnum taskCategory;
@ -51,6 +58,22 @@ public class TaskStatQueryVO {
this.month = month; 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() { public TaskCategoryEnum getTaskCategory() {
return taskCategory; return taskCategory;
} }

4
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.task.api.factory;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.task.api.RemoteTaskService; import com.ruoyi.task.api.RemoteTaskService;
import com.ruoyi.task.api.domain.TaskDTO; 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.domain.TaskTempVO;
import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.enums.StatusEnum;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -48,7 +48,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
} }
@Override @Override
public R<List<TaskDTO>> getTaskList(TaskQueryDTO queryDTO, String source) { public R<List<TaskDTO>> getTaskList(TaskQueryVO queryDTO, String source) {
return R.ok(Collections.emptyList()); return R.ok(Collections.emptyList());
} }