Merge remote-tracking branch 'origin/master'

puzhibing

2026-03-21 0385f39d811ca39026f4c0c9a7a36deefcb60187

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpWorkOrderServiceImpl.java

@@ -1,5 +1,7 @@
package com.xiaopeng.maintenance.service.impl;

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.feignClient.account.SysUserClient;
@@ -9,18 +11,19 @@
import com.xiaopeng.api.model.maintenance.XpWorkOrderLog;
import com.xiaopeng.api.model.operation.XpFeedbackType;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.mapper.XpWorkOrderLogMapper;
import com.xiaopeng.maintenance.mapper.XpWorkOrderMapper;
import com.xiaopeng.maintenance.model.query.WorkOrderPageListQuery;
import com.xiaopeng.maintenance.model.vo.TaskManagementPageListVO;
import com.xiaopeng.maintenance.service.IXpWorkOrderService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -42,6 +45,9 @@

    @Autowired
    private XpWorkOrderLogMapper workOrderLogMapper;

    @Resource
    private AliOssService aliOssService;

    @Override
    public PageInfo<XpWorkOrder> pageList(WorkOrderPageListQuery query) {
@@ -70,6 +76,25 @@
            if (feedbackType != null) {
                xpWorkOrder.setFeedbackTypeName(feedbackType.getFeedbackType());
            }
            //图片回显
            String problemImage = xpWorkOrder.getProblemImage();
            if (StringUtils.isNotBlank(problemImage)) {
                JSONArray jsonArray = JSONArray.parseArray(problemImage);
                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    if (Objects.isNull(jsonObject)) {
                        continue;
                    }
                    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);
                }
                xpWorkOrder.setProblemImage(JSONArray.toJSONString(jsonArray));
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
@@ -78,6 +103,26 @@
    @Override
    public XpWorkOrder workOrderDetail(Long id) {
        XpWorkOrder workOrder = this.getById(id);
        // 图片回显
        String problemImage = workOrder.getProblemImage();
        if (StringUtils.isNotBlank(problemImage)) {
            JSONArray jsonArray = JSONArray.parseArray(problemImage);
            for (int i = 0; i < jsonArray.size(); i++) {
                JSONObject jsonObject = jsonArray.getJSONObject(i);
                if (Objects.isNull(jsonObject)) {
                    continue;
                }
                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);
            }
            workOrder.setProblemImage(JSONArray.toJSONString(jsonArray));
        }
        List<XpWorkOrderLog> workOrderLogs = workOrderLogMapper.selectList(new LambdaQueryWrapper<XpWorkOrderLog>()
                .eq(XpWorkOrderLog::getWorkOrderId, id));
        XpFeedbackType feedbackType = systemSettingClient.getFeedbackTypeById(workOrder.getFeedbackTypeId()).getData();