From d9cffa70b7e8f9dcc505c72e0fd87e9e553e7901 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 18 三月 2026 19:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 209 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
index 389e292..e564ccb 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
@@ -1,11 +1,14 @@
package com.xiaopeng.maintenance.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.dto.XpVehicleDetectionDTO;
import com.xiaopeng.maintenance.model.query.XpVehicleDetectionPageQuery;
import com.xiaopeng.maintenance.model.vo.XpVehicleDetectionVO;
@@ -13,6 +16,7 @@
import com.xiaopeng.maintenance.service.XpTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +24,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.io.UnsupportedEncodingException;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -42,7 +48,7 @@
@Autowired
private TokenService tokenService;
@Autowired
- private XpVehicleClient xpVehicleClient;
+ private AliOssService aliOssService;
@Autowired
private XpOperationUserClient xpOperationUserClient;
@Autowired
@@ -53,11 +59,11 @@
*/
@ApiOperation(value = "车辆运维-车辆运维-开始自检", tags = {"运维APP-车辆管理"})
@GetMapping("/api/v1/vehicleDetection/startDetection")
- public R<Map<String,Integer>> startDetection(@RequestParam Long vehicleId) {
+ public R<Map<String, Integer>> startDetection(@RequestParam Long vehicleId) {
// TODO 开始自检
- Map<String,Integer> result = new HashMap<>(6);
+ Map<String, Integer> result = new HashMap<>(6);
result.put("networkDetection", 1); // 网络检测
result.put("remoteSelfCheck", 1); // 远程自检
result.put("versionVerification", 1); // 版本验证
@@ -91,8 +97,107 @@
*/
@ApiOperation(value = "车辆运维-运维记录-检测记录详情", tags = {"运维APP-车辆管理"})
@GetMapping("/api/v1/vehicleDetection/detectionDetail")
- public R<XpVehicleDetectionVO> detectionDetail(@RequestParam Long id) {
+ public R<XpVehicleDetectionVO> detectionDetail(@RequestParam Long id) throws UnsupportedEncodingException {
XpVehicleDetectionVO xpVehicleDetectionVO = xpVehicleDetectionService.detectionDetail(id);
+
+ String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures();
+ if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
+ JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ xpVehicleDetectionVO.setVehiclePictures(downloadUrl);
+ }
+
+
+ String sensorCleaningPicture = xpVehicleDetectionVO.getSensorCleaningPicture();
+ if (StringUtils.isNotBlank(sensorCleaningPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(sensorCleaningPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list));
+ }
+
+
+ String interactiveScreenPicture = xpVehicleDetectionVO.getInteractiveScreenPicture();
+ if (StringUtils.isNotBlank(interactiveScreenPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(interactiveScreenPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list));
+ }
+
+
+ String helpButtonPicture = xpVehicleDetectionVO.getHelpButtonPicture();
+ if (StringUtils.isNotBlank(helpButtonPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(helpButtonPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list));
+ }
+
+
+ String paymentFunctionPicture = xpVehicleDetectionVO.getPaymentFunctionPicture();
+ if (StringUtils.isNotBlank(paymentFunctionPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(paymentFunctionPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list));
+ }
+
+
+ String systemCheckPicture = xpVehicleDetectionVO.getSystemCheckPicture();
+ if (StringUtils.isNotBlank(systemCheckPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(systemCheckPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list));
+ }
+
+
return R.ok(xpVehicleDetectionVO);
}
@@ -103,8 +208,107 @@
*/
@ApiOperation(value = "通过车辆id查询检测分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
@PostMapping("/api/v1/vehicle/queryDetectionByVehicleId")
- public R<PageInfo<XpVehicleDetectionVO>> queryDetectionByVehicleId(@Valid @RequestBody XpVehicleDetectionPageQuery query) {
+ public R<PageInfo<XpVehicleDetectionVO>> queryDetectionByVehicleId(@Valid @RequestBody XpVehicleDetectionPageQuery query) throws UnsupportedEncodingException {
PageInfo<XpVehicleDetectionVO> pageInfo = xpVehicleDetectionService.queryDetectionByVehicleId(query);
+ for (XpVehicleDetectionVO xpVehicleDetectionVO : pageInfo.getRecords()) {
+ String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures();
+ if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
+ JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ xpVehicleDetectionVO.setVehiclePictures(downloadUrl);
+ }
+
+
+ String sensorCleaningPicture = xpVehicleDetectionVO.getSensorCleaningPicture();
+ if (StringUtils.isNotBlank(sensorCleaningPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(sensorCleaningPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list));
+ }
+
+
+ String interactiveScreenPicture = xpVehicleDetectionVO.getInteractiveScreenPicture();
+ if (StringUtils.isNotBlank(interactiveScreenPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(interactiveScreenPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list));
+ }
+
+
+ String helpButtonPicture = xpVehicleDetectionVO.getHelpButtonPicture();
+ if (StringUtils.isNotBlank(helpButtonPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(helpButtonPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list));
+ }
+
+
+ String paymentFunctionPicture = xpVehicleDetectionVO.getPaymentFunctionPicture();
+ if (StringUtils.isNotBlank(paymentFunctionPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(paymentFunctionPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list));
+ }
+
+
+ String systemCheckPicture = xpVehicleDetectionVO.getSystemCheckPicture();
+ if (StringUtils.isNotBlank(systemCheckPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(systemCheckPicture);
+ ArrayList<String> list = new ArrayList<>(jsonArray.size());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ list.add(downloadUrl);
+ }
+ xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list));
+ }
+
+ }
return R.ok(pageInfo);
}
}
--
Gitblit v1.7.1