liujie
2026-03-15 d2930f1fbcea3ae5c8f6202487eb20e23affa1c4
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
3个文件已修改
14 ■■■■■ 已修改文件
xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml
@@ -86,15 +86,15 @@
        <if test="query.sortType != null">
            <if test="query.sortType == 1">
                order by t1.create_time desc, t1.task_urgency_level
                order by t1.task_urgency_level, t1.create_time desc
                <if test="query.sortRule == 2">
                    desc
                    desc, t1.create_time desc
                </if>
            </if>
            <if test="query.sortType == 2">
                order by t1.create_time desc, t2.plate_number
                order by t2.plate_number, t1.create_time desc
                <if test="query.sortRule == 2">
                    desc
                    desc, t1.create_time desc
                </if>
            </if>
            <if test="query.sortType == 3">
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
@@ -193,6 +193,10 @@
    }
    private String buildCityPrefix(Long electronicAreaId) {
        //所有围栏范围之外,测试点位
        if(0 == electronicAreaId){
            return "TEST";
        }
        XpElectronicFenceArea area = xpElectronicFenceAreaService.getById(electronicAreaId);
        if (area == null) {
            throw new ServiceException("运营区域不存在", I18nKeyConstant.POINT_ELECTRONIC_AREA_NOT_EXIST);
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java
@@ -41,7 +41,7 @@
            String fileId = UUID.randomUUID().toString();
            //上传文件
//            aliOssService.uploadFile(file.getBytes(), fileId);
//            String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true);
//            String downloadUrl = aliOssService.getDownloadUrl(fil aeId, fileName,true);
//            FileUploadVO fileUploadVO = new FileUploadVO();
//            fileUploadVO.setId(fileId);
//            fileUploadVO.setName(fileName);