Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

liujie

2026-06-09 c96fbe6b0aeb413a17c429133ee6d81d138144b9

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java

@@ -1,7 +1,7 @@
package com.xiaopeng.maintenance.controller;


import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.api.model.maintenance.XpVehicleRepair;
@@ -14,12 +14,14 @@
import com.xiaopeng.maintenance.dto.XpVehicleRepairReturnDTO;
import com.xiaopeng.maintenance.dto.XpVehicleRepairStartDTO;
import com.xiaopeng.maintenance.model.query.XpVehicleRepairPageQuery;
import com.xiaopeng.maintenance.model.vo.XpVehicleRepairMgtVO;
import com.xiaopeng.maintenance.model.vo.XpVehicleRepairVO;
import com.xiaopeng.maintenance.schedule.InsuranceInspectionScheduleTask;
import com.xiaopeng.maintenance.service.IXpVehicleRepairService;
import com.xiaopeng.maintenance.vo.RepairStatusVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -39,6 +41,7 @@
 * @author xiaochen
 * @since 2026-02-06
 */
@Slf4j
@Api(tags = "车辆维修")
@RestController
public class XpVehicleRepairController {
@@ -54,7 +57,7 @@
     * 车辆详情-车辆运维-车辆送修
     */
    @ApiOperation(value = "车辆运维-车辆运维-车辆送修", tags = {"运维APP-车辆管理"})
    @PostMapping("/api/v1/vehicleRepair/saveRepair")
    @PostMapping("/maintenance-app/api/v1/vehicleRepair/saveRepair")
    public R<String> saveRepair(@Validated @RequestBody XpVehicleRepairStartDTO dto) {

        Long id = tokenService.getLoginOperationUser().getId();
@@ -65,7 +68,7 @@
     * 车辆详情-车辆运维-车辆取回
     */
    @ApiOperation(value = "车辆运维-车辆运维-车辆取回", tags = {"运维APP-车辆管理"})
    @PostMapping("/api/v1/vehicleRepair/saveReturnRepair")
    @PostMapping("/maintenance-app/api/v1/vehicleRepair/saveReturnRepair")
    public R<String> saveReturnRepair(@Validated @RequestBody XpVehicleRepairReturnDTO dto) {
        Long id = tokenService.getLoginOperationUser().getId();
        if (dto.getRepairMoney()>99999999.99) {
@@ -79,7 +82,7 @@
     * 车辆详情-车辆运维-查询车辆维修状态
     */
    @ApiOperation(value = "车辆运维-车辆运维-查询车辆维修状态", tags = {"运维APP-车辆管理"})
    @GetMapping("/api/v1/vehicleRepair/queryRepairStatus")
    @GetMapping("/maintenance-app/api/v1/vehicleRepair/queryRepairStatus")
    public R<RepairStatusVO> queryRepairStatus(@RequestParam Long vehicleId) {
        Long id = tokenService.getLoginOperationUser().getId();
        RepairStatusVO repairStatusVO = xpVehicleRepairService.queryRepairStatus(vehicleId);
@@ -90,7 +93,7 @@
     * 车辆运维-车辆运维-维修记录详情
     */
    @ApiOperation(value = "车辆运维-运维记录-维修记录详情", tags = {"运维APP-车辆管理"})
    @GetMapping("/api/v1/vehicleRepair/repairDetail")
    @GetMapping("/maintenance-app/api/v1/vehicleRepair/repairDetail")
    public R<XpVehicleRepairVO> repairDetail(@RequestParam Long id) throws UnsupportedEncodingException {
        XpVehicleRepairVO xpVehicleRepairVO = xpVehicleRepairService.repairDetail(id);

@@ -98,7 +101,12 @@
        if (StringUtils.isNotBlank(vehiclePictures)) {
            JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
            // 1
            String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                String downloadUrl = jsonObject.getString("url");
                try {
                    downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (UnsupportedEncodingException e) {
                    log.error("获取图片下载地址失败", e);
                }
            jsonObject.put("url", downloadUrl);
            xpVehicleRepairVO.setVehiclePictures(jsonObject.toJSONString());
        }
@@ -106,21 +114,36 @@
        String startRepairPicture = xpVehicleRepairVO.getStartRepairPicture();
        if (StringUtils.isNotBlank(startRepairPicture)) {
            JSONArray jsonArray = JSONArray.parseArray(startRepairPicture);
            ArrayList<String> list = new ArrayList<>(jsonArray.size());
            for (Object o : jsonArray) {
                JSONObject jsonObject = JSONObject.parseObject(o.toString());
                String downloadUrl = null;
            for (int i = 0; i < jsonArray.size(); i++) {
                JSONObject jsonObject = jsonArray.getJSONObject(i);
                if (Objects.isNull(jsonObject)) {
                    continue;
                }
                // 1
                String downloadUrl = jsonObject.getString("url");
                try {
                    // 2
                    downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (UnsupportedEncodingException e) {
                    throw new RuntimeException(e);
                    log.error("获取图片下载地址失败", e);
                }
                list.add(downloadUrl);
                jsonObject.put("url", downloadUrl);
            }
            xpVehicleRepairVO.setStartRepairPicture(String.join(",", list));
            xpVehicleRepairVO.setStartRepairPicture(JSONArray.toJSONString(jsonArray));
        }

        String repairMoneyDetail = xpVehicleRepairVO.getRepairMoneyDetail();
        if (StringUtils.isNotBlank(repairMoneyDetail)) {
            JSONObject jsonObject = JSONObject.parseObject(repairMoneyDetail);
            if(jsonObject!=null){
                String downloadUrl = null;
                try {
                    downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                jsonObject.put("url", downloadUrl);
                xpVehicleRepairVO.setRepairMoneyDetail(jsonObject.toJSONString());
            }
        }

        return R.ok(xpVehicleRepairVO);
    }
@@ -132,15 +155,20 @@
     */
    @ApiOperation(value = "通过车辆id查询维修分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
    @PostMapping("/api/v1/vehicle/queryRepairByVehicleId")
    public R<PageInfo<XpVehicleRepairVO>> queryRepairByVehicleId(@Valid @RequestBody XpVehicleRepairPageQuery query) throws UnsupportedEncodingException {
        PageInfo<XpVehicleRepairVO> pageInfo = xpVehicleRepairService.queryDetectionByVehicleId(query);
    public R<PageInfo<XpVehicleRepairMgtVO>> queryRepairByVehicleId(@Valid @RequestBody XpVehicleRepairPageQuery query) throws UnsupportedEncodingException {
        PageInfo<XpVehicleRepairMgtVO> pageInfo = xpVehicleRepairService.queryDetectionByVehicleId(query);

        for (XpVehicleRepairVO record : pageInfo.getRecords()) {
        for (XpVehicleRepairMgtVO record : pageInfo.getRecords()) {
            String vehiclePictures = record.getVehiclePictures();
            if (StringUtils.isNotBlank(vehiclePictures)) {
                JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
                //1
                String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    String downloadUrl = jsonObject.getString("url");;
                try {
                    downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (UnsupportedEncodingException e) {
                    log.error("获取图片下载地址失败", e);
                }
                jsonObject.put("url", downloadUrl);
                record.setVehiclePictures(jsonObject.toJSONString());
            }
@@ -148,14 +176,16 @@
            String startRepairPicture = record.getStartRepairPicture();
            if (StringUtils.isNotBlank(startRepairPicture)) {
                JSONArray jsonArray = JSONArray.parseArray(startRepairPicture);
                for (Object o : jsonArray) {
                    JSONObject jsonObject = JSONObject.parseObject(o.toString());
                    String downloadUrl = null;
                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    if (Objects.isNull(jsonObject)) {
                        continue;
                    }
                    String downloadUrl = jsonObject.getString("url");;
                    try {
                        //1
                        downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    } catch (UnsupportedEncodingException e) {
                        throw new RuntimeException(e);
                        log.error("获取图片下载地址失败", e);
                    }
                    jsonObject.put("url", downloadUrl);
                }
@@ -166,7 +196,7 @@
        return R.ok(pageInfo);
    }

    @GetMapping("/inner/xpVehicleRepair/getMaintenanceStatus")
    @GetMapping("/logan/inner/xpVehicleRepair/getMaintenanceStatus")
    public R<Integer> getMaintenanceStatus(@RequestParam Long vehicleId){

        XpVehicleRepair xpVehicleRepair = xpVehicleRepairService.getOne(new LambdaQueryWrapper<XpVehicleRepair>()