后管-电签监控

1、返回参数调整

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TaskBatchMonitorVo.java

@@ -0,0 +1,21 @@
+package org.springblade.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LHB
+ */
+@Data
+public class TaskBatchMonitorVo {
+    @ApiModelProperty("状态：true-运行中，false-已停止")
+    private Boolean status;
+    @ApiModelProperty("执行数量")
+    private long runTotal;
+    @ApiModelProperty("等待数量")
+    private long orderTotal;
+    @ApiModelProperty("列表数据")
+    private List<TaskBatchMonitorDTO> list;
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskBatchController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.business.dto.TaskBatchMonitorDTO;
+import org.springblade.business.dto.TaskBatchMonitorVo;
 import org.springblade.business.dto.TaskBatchPage;
 import org.springblade.business.service.ITaskBatchService;
 import org.springblade.core.tool.api.R;
@@ -37,7 +38,7 @@ public class TaskBatchController {
     @PostMapping("/page")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "电签监控接口")
-    public R<Map<String, Object>> selectTaskBatchList(@RequestBody TaskBatchPage page){
+    public R<TaskBatchMonitorVo> selectTaskBatchList(@RequestBody TaskBatchPage page){
         return taskBatchService.selectTaskBatchList(page);
     }
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/ITaskBatchService.java

@@ -18,6 +18,7 @@ package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.business.dto.TaskBatchMonitorDTO;
+import org.springblade.business.dto.TaskBatchMonitorVo;
 import org.springblade.business.dto.TaskBatchPage;
 import org.springblade.business.entity.TaskBatch;
 import org.springblade.core.mp.base.BaseService;
@@ -41,5 +42,5 @@ public interface ITaskBatchService extends BaseService<TaskBatch> {
 
     List<TaskBatch> queryDataInfo();
 
-    R<Map<String, Object>> selectTaskBatchList(TaskBatchPage page);
+    R<TaskBatchMonitorVo> selectTaskBatchList(TaskBatchPage page);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskBatchServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.business.dto.TaskBatchMonitorDTO;
+import org.springblade.business.dto.TaskBatchMonitorVo;
 import org.springblade.business.dto.TaskBatchPage;
 import org.springblade.business.entity.TaskBatch;
 import org.springblade.business.mapper.TaskBatchMapper;
@@ -75,7 +76,7 @@ public class TaskBatchServiceImpl extends BaseServiceImpl<TaskBatchMapper, TaskB
     }
 
     @Override
-    public R<Map<String, Object>> selectTaskBatchList(TaskBatchPage page) {
+    public R<TaskBatchMonitorVo> selectTaskBatchList(TaskBatchPage page) {
         //初始化查询参数
         page.setTaskType(page.getTaskType() == null ? 1 : page.getTaskType());
 
@@ -109,12 +110,12 @@ public class TaskBatchServiceImpl extends BaseServiceImpl<TaskBatchMapper, TaskB
         } catch (Exception e) {}
         long runTotal = list.stream().filter(f -> f.getTaskType() == 1).count();
         long orderTotal = list.stream().filter(f -> f.getTaskType() == 2).count();
-        Map<String, Object> map = new HashMap<>();
-        map.put("status",jarRunning);
-        map.put("runTotal",runTotal);
-        map.put("orderTotal",orderTotal);
-        map.put("list",list.stream().filter(f -> Objects.equals(f.getTaskType(), page.getTaskType())).collect(Collectors.toList()));
-        return R.data(map);
+        TaskBatchMonitorVo taskBatchMonitorVo = new TaskBatchMonitorVo();
+        taskBatchMonitorVo.setStatus(jarRunning);
+        taskBatchMonitorVo.setRunTotal(runTotal);
+        taskBatchMonitorVo.setOrderTotal(orderTotal);
+        taskBatchMonitorVo.setList(list.stream().filter(f -> Objects.equals(f.getTaskType(), page.getTaskType())).collect(Collectors.toList()));
+        return R.data(taskBatchMonitorVo);
     }
 
     /**