From 2c0a9a5194596d05b00aa773133582fa16deb6ea Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期日, 17 五月 2026 17:00:21 +0800
Subject: [PATCH] 不提交

---
 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
index 8babcb0..62cd452 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
@@ -203,25 +203,25 @@
                 //总数
                 pointsNumbers.setTotalNum(pointList.size());
                 //待测试
-                long count = pointList.stream().filter(xpPoint -> xpPoint.getVerificationStatus() == 1).count();
+                long count = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 1 && xpPoint.getVerificationStatus() == 1).count();
                 pointsNumbers.setToBeTested(Integer.parseInt(count+""));
                 //测试中
-                long count2 = pointList.stream().filter(xpPoint -> xpPoint.getVerificationStatus() == 2).count();
+                long count2 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 1 && xpPoint.getVerificationStatus() == 2).count();
                 pointsNumbers.setTesting(Integer.parseInt(count2+""));
                 //测试不通过
-                long count3 = pointList.stream().filter(xpPoint -> xpPoint.getVerificationStatus() == 4).count();
+                long count3 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 1 && xpPoint.getVerificationStatus() == 4).count();
                 pointsNumbers.setTestNotPass(Integer.parseInt(count3+""));
                 //待启用
-                long count4 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 1 && xpPoint.getVerificationStatus() == 3).count();
+                long count4 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 1 && (xpPoint.getVerificationStatus() == 3 || xpPoint.getVerificationStatus() == 5)).count();
                 pointsNumbers.setPendingLaunch(Integer.parseInt(count4+""));
                 //启用中
-                long count5 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 2 && xpPoint.getVerificationStatus() == 3).count();
+                long count5 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 2 && xpPoint.getVerificationStatus() == 5).count();
                 pointsNumbers.setStartingUp(Integer.parseInt(count5+""));
                 //已停用
-                long count6 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 3 && xpPoint.getVerificationStatus() == 3).count();
+                long count6 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 3 && xpPoint.getVerificationStatus() == 5).count();
                 pointsNumbers.setDisabled(Integer.parseInt(count6+""));
                 //已失效
-                long count7 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 4 && xpPoint.getVerificationStatus() == 3).count();
+                long count7 = pointList.stream().filter(xpPoint -> xpPoint.getOperationStatus() == 4 && xpPoint.getVerificationStatus() == 5).count();
                 pointsNumbers.setExpired(Integer.parseInt(count7+""));
             }
             res.setPointsNumbers(pointsNumbers);

--
Gitblit v1.7.1