Merge remote-tracking branch 'origin/master'

puzhibing

2026-04-07 aefa3f8f1d461cb713d689f1c28f612e0cd56241

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java

@@ -275,6 +275,66 @@
            }
        }

        if (xpOperationsUserVO.getIdCardFront() != null) {
            JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getIdCardFront());
            if(jsonObject!=null){
                String downloadUrl = null;
                try {
                    // 1
                    downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                jsonObject.put("url", downloadUrl);
                xpOperationsUserVO.setIdCardFront(jsonObject.toJSONString());
            }
        }

        if (xpOperationsUserVO.getIdCardBack() != null) {
            JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getIdCardBack());
            if(jsonObject!=null){
                String downloadUrl = null;
                try {
                    // 1
                    downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                jsonObject.put("url", downloadUrl);
                xpOperationsUserVO.setIdCardBack(jsonObject.toJSONString());
            }
        }
        if (xpOperationsUserVO.getDriverLicense() != null) {
            JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getDriverLicense());
            if(jsonObject!=null){
                String downloadUrl = null;
                try {
                    // 1
                    downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                jsonObject.put("url", downloadUrl);
                xpOperationsUserVO.setDriverLicense(jsonObject.toJSONString());
            }
        }

        if (xpOperationsUserVO.getCertificateOfNoCriminalRecord() != null) {
            JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getCertificateOfNoCriminalRecord());
            if(jsonObject!=null){
                String downloadUrl = null;
                try {
                    // 1
                    downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                jsonObject.put("url", downloadUrl);
                xpOperationsUserVO.setCertificateOfNoCriminalRecord(jsonObject.toJSONString());
            }
        }


        return R.ok(xpOperationsUserVO);
    }


 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java

@@ -112,10 +112,18 @@
            }
            // 是否运营时间内
            if(xpElectronicFence.getFailureType() == 2){
                Boolean inOperationTime = isInOperationTime(operationStrategy);
                if(!inOperationTime){
                JSONArray jsonArray = JSONArray.parseArray(operationStrategy);
                if(!jsonArray.isEmpty()){
                    Boolean inOperationTime = isInOperationTime(operationStrategy);
                    if(!inOperationTime){
                        continue;
                    }
                }

                if(LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime())){
                    continue;
                }

            }else{
                //永不失效，需要判断开始时间是否到达
                if(LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java

@@ -303,14 +303,14 @@
        List<XpPoint> list = this.baseMapper.listAll(query);
        for (XpPoint xpPoint : list) {
            String pointPictures = xpPoint.getPointPictures();
            if (org.apache.commons.lang3.StringUtils.isNotBlank(pointPictures)) {
            if (StringUtils.isNotBlank(pointPictures)) {
                JSONArray jsonArray = JSONArray.parseArray(pointPictures);
                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    if (Objects.isNull(jsonObject)) {
                        continue;
                    }
                    String downloadUrl = jsonObject.getString("url");;
                    String downloadUrl ="";
                    try {
                        downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    } catch (UnsupportedEncodingException e) {