From a827c6fd67f22b12d9e143f327507609ea1c70e7 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期三, 13 五月 2026 13:34:37 +0800
Subject: [PATCH] 1.围栏详情 接口添加 点位测试状态统计
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 b1ddae2..7822645 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
@@ -196,18 +196,38 @@
ElectronicFenceDetailVo.Numbers pointsNumbers = new ElectronicFenceDetailVo.Numbers();
if(CollUtil.isNotEmpty(pointList)){
+ LocalTime localTime = LocalTime.now();
for (XpPoint xpPoint : pointList) {
- if (xpPoint.getOperationStatus() == 1) {
- pointsNumbers.setPendingLaunch(pointsNumbers.getPendingLaunch() + 1);
- } else if (xpPoint.getOperationStatus() == 2) {
- pointsNumbers.setStartingUp(pointsNumbers.getStartingUp() + 1);
+ if(xpPoint.getVerificationStatus() !=5){
+ //verificationStatus 验证状态 1=待验证、2=验证中、3=已验证 4验证失败 5待生效
+ if (xpPoint.getVerificationStatus() == 1){
+ pointsNumbers.setToBeTested(pointsNumbers.getToBeTested() + 1);
+ }else if (xpPoint.getVerificationStatus() == 2){
+ pointsNumbers.setTesting(pointsNumbers.getTesting() + 1);
+ }else if (xpPoint.getVerificationStatus() == 4){
+ pointsNumbers.setTestNotPass(pointsNumbers.getTestNotPass() + 1);
+ }
+ }else{
+ //operationStatus 运营状态 1=待启用 2=启用中 3=已停用 4=已失效
+ if(xpPoint.getOperationStatus() == 1){
+ pointsNumbers.setPendingLaunch(pointsNumbers.getPendingLaunch() + 1);
+ }
+ else if (xpPoint.getOperationStatus() == 2) {
+ boolean pointOperation = bootCommonService.getPointOperation(localTime, xpPoint);
+ if (pointOperation) {
+ pointsNumbers.setStartingUp(pointsNumbers.getStartingUp() + 1);
+ }else{
+ pointsNumbers.setPendingLaunch(pointsNumbers.getPendingLaunch() + 1);
+ }
+ }
+ else if (xpPoint.getOperationStatus() == 3) {
+ pointsNumbers.setExpired(pointsNumbers.getExpired() + 1);
+ }
+ else if (xpPoint.getOperationStatus() == 4) {
+ pointsNumbers.setDisabled(pointsNumbers.getDisabled() + 1);
+ }
}
- else if (xpPoint.getOperationStatus() == 3) {
- pointsNumbers.setExpired(pointsNumbers.getExpired() + 1);
- }
- else if (xpPoint.getOperationStatus() == 4) {
- pointsNumbers.setDisabled(pointsNumbers.getDisabled() + 1);
- }
+
}
pointsNumbers.setTotalNum(pointList.size());
}
@@ -221,7 +241,6 @@
ElectronicFenceDetailVo.Numbers stationNumbers = new ElectronicFenceDetailVo.Numbers();
if(CollUtil.isNotEmpty(stationList)){
- LocalDateTime now = LocalDateTime.now();
LocalTime localTime = LocalTime.now();
//status 场站状态 0=草稿 1=待启用 2=启用中 3=已停用 4=失效
for (XpStation xpStation : stationList) {
--
Gitblit v1.7.1