From b5ad78ef20d012da5efe3a087646dc65217547c7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 15:42:00 +0800
Subject: [PATCH] 删除演示代码和新增加1模型结果

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
index a75ae6d..336ac3c 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -124,12 +124,15 @@
 		info.setName(patrolTask.getName());
 		info.setStatus(taskDetail.getStatus());
 		info.setExecutionTime(taskDetail.getExecutionTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-		long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
+		//执行状态(1=待执行,2=执行中,3=成功,4=离线,5=失败)
+		long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
 		info.setOfflineNum(offlineNum);
-		long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
+		long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
 		info.setNormalNum(normalNum);
-		long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
+		long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 5).count();
 		info.setAbnormalNum(abnormalNum);
+		long underway = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
+		info.setUnderway(underway);
 		return info;
 	}
 	

--
Gitblit v1.7.1