Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-05-13 242ff122dd7515f426baec4ee1ac967557c5af15

Merge remote-tracking branch 'origin/1.0' into 1.0

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/ElectronicFenceDetailVo.java

@@ -28,11 +28,19 @@
    public static class Numbers {
        @ApiModelProperty("总数")
        public   Integer totalNum =0;

        @ApiModelProperty("待测试")
        public   Integer toBeTested =0;
        @ApiModelProperty("测试中")
        public   Integer testing =0;
        @ApiModelProperty("测试不通过")
        public   Integer testNotPass =0;

        @ApiModelProperty("草稿")
        public   Integer draft =0;
        @ApiModelProperty("启动中")
        public   Integer startingUp =0;
        @ApiModelProperty("待启动")
        @ApiModelProperty("待生效")
        public   Integer pendingLaunch =0;
        @ApiModelProperty("已停用")
        public   Integer disabled =0;

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java

@@ -199,18 +199,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());
            }
@@ -224,7 +244,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) {