From 6f372b9d09a4b3519a3966a62d58d95805d261c2 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 22:49:48 +0800
Subject: [PATCH] 下载字段status
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
index 4a780a5..afd407f 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -45,9 +46,9 @@
- @GetMapping("/api/patrolTask/getTaskDetailList")
+ @PostMapping("/api/patrolTask/getTaskDetailList")
@ApiOperation(value = "获取任务列表数据", tags = {"任务管理"})
- public PageInfoBT<TaskDetailList> getTaskDetailList(TaskDetailListVo vo){
+ public PageInfoBT<TaskDetailList> getTaskDetailList(@RequestBody TaskDetailListVo vo){
Page<TaskDetailList> pageInfo = new Page(vo.getLimit(), vo.getOffset());
List<TaskDetailList> taskDetailList = taskDetailService.getTaskDetailList(pageInfo, vo);
pageInfo.setRecords(taskDetailList);
@@ -156,9 +157,9 @@
- @GetMapping("/api/patrolTask/getTaskRecordList")
+ @PostMapping("/api/patrolTask/getTaskRecordList")
@ApiOperation(value = "获取任务记录列表", tags = {"任务记录"})
- public PageInfoBT<TaskRecordList> getTaskRecordList(TaskRecordListVo vo){
+ public PageInfoBT<TaskRecordList> getTaskRecordList(@RequestBody TaskRecordListVo vo){
Page<TaskRecordList> pageInfo = new Page(vo.getLimit(), vo.getOffset());
List<TaskRecordList> taskRecordList = taskDetailService.getTaskRecordList(pageInfo, vo);
pageInfo.setRecords(taskRecordList);
@@ -218,17 +219,25 @@
@ApiOperation(value = "下载任务记录数据", tags = {"任务记录"})
@ApiImplicitParams({
@ApiImplicitParam(value = "列表数据id，多个逗号分隔", name = "ids", dataType = "String"),
- @ApiImplicitParam(value = "状态（1=待执行，2=进行中，3=成功，4=失败）", name = "status", dataType = "int"),
+ @ApiImplicitParam(value = "状态（1=待执行，2=进行中，3=成功，4=失败）", name = "statuss", dataType = "String"),
@ApiImplicitParam(value = "规则编号", name = "code", dataType = "String"),
@ApiImplicitParam(value = "系统审核状态（1=未执行，2=正常，3=异常）", name = "sysStatus", dataType = "int"),
})
- public void downloadTaskRecord(String ids, String code, Integer status,Integer sysStatus, HttpServletResponse response){
+ public void downloadTaskRecord(String ids, String code, String statuss,Integer sysStatus, HttpServletResponse response){
List<String> id = null;
if(ToolUtil.isNotEmpty(ids)){
String[] split = ids.split(",");
id = Arrays.asList(split);
}
- taskDetailService.downloadTaskRecord(id, code, status,sysStatus, response);
+ List<Integer> statusList=null;
+ if(ToolUtil.isNotEmpty(statuss)){
+ String[] split = ids.split(",");
+ statusList = Arrays.stream(split)
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+
+ }
+ taskDetailService.downloadTaskRecord(id, code, statusList,sysStatus, response);
}
--
Gitblit v1.7.1