From 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 五月 2026 15:01:47 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java | 92 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
index fc7ccce..c00377d 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
@@ -3,6 +3,8 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson2.JSONObject;
+import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.SysUser;
@@ -16,7 +18,11 @@
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.utils.ip.IpUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.common.security.service.TokenService;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.dto.HandleVehicleAccidentDto;
import com.xiaopeng.maintenance.dto.SaveErrorTaskDto;
import com.xiaopeng.maintenance.dto.SaveRoutineDetailDto;
@@ -35,6 +41,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -42,11 +49,14 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -68,22 +78,33 @@
@Resource
private IXpErrorTypeService xpErrorTypeService;
@Resource
- private XpFleetOperationsClient xpFleetOperationsClient;
+ private XpOperationUserClient operationUserClient;
+ @Resource
+ private AliOssService aliOssService;
@Resource
private XpVehicleClient xpVehicleClient;
+
@ApiOperation(value = "事故类型列表", response = XpErrorType.class)
@GetMapping("/errorTypeList")
public R<List<XpErrorType>> errorTypeList() {
return xpErrorTypeService.errorTypeList();
}
+
@ApiOperation(value = "任务中心列表", response = TaskManagementPageListVO.class)
@PostMapping("/pageList")
public R<PageInfo<TaskManagementPageListVO>> pageListManagement(@RequestBody TaskManagementPageListQuery query) {
PageInfo<TaskManagementPageListVO> pageList = xpTaskService.pageListManagement(query);
return R.ok(pageList);
}
+
@ApiOperation(value = "任务工单导出")
@PostMapping(value = "/exportExcel")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
+ operationType = AdminOperationType.EXPORT,
+ content = "导出任务工单",
+ appendRequestData = true
+ )
public void exportExcel(@RequestBody TaskManagementPageListQuery query) {
List<TaskManagementPageListVO> exportList = xpTaskService.exportList(query);
List<XpTaskExportExcel> taskExportExcels = new ArrayList<>();
@@ -95,7 +116,18 @@
xpTaskExportExcel.setTaskTypeName(task.getTaskTypeName());
xpTaskExportExcel.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
xpTaskExportExcel.setTaskDescription(task.getTaskDescription());
- xpTaskExportExcel.setHandleUserName(task.getHandleUserName());
+ if (StringUtils.hasLength(task.getHandleUserId())) {
+ String[] split = task.getHandleUserId().split(",");
+
+ List<XpOperationsUser> users = operationUserClient.listByIds(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList())).getData();
+ if (users != null) {
+ StringBuilder handleUserName = new StringBuilder();
+ for (XpOperationsUser user : users) {
+ handleUserName.append(user.getNickName()).append(";");
+ }
+ xpTaskExportExcel.setHandleUserName(handleUserName.toString());
+ }
+ }
xpTaskExportExcel.setNumber(num);
xpTaskExportExcel.setStatus(task.getStatus());
LocalDateTime createTime = task.getCreateTime();
@@ -126,47 +158,87 @@
}
}
+
/**
* 管理后台-车辆管理-运营车辆管理-删除任务/事故
+ *
* @param id
* @return
*/
@ApiOperation(value = "删除任务/事故")
@DeleteMapping("/deleteTaskById")
- public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID")Long id){
+ @AdminOperationLog(
+ businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
+ operationType = AdminOperationType.DELETE,
+ contentExpression = "'删除任务/事故,id=' + #p0",
+ appendRequestData = false
+ )
+ public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") Long id) {
xpTaskService.deleteTaskById(id);
return R.ok();
}
+
@ApiOperation(value = "任务分配")
@GetMapping("/assigneeTask")
- public R assigneeTask(@ApiParam(name = "id", value = "任务ID") Long id, @ApiParam(name = "handlerUserId", value = "处理人id")Long handlerUserId) {
+ @AdminOperationLog(
+ businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ contentExpression = "'任务分配,id=' + #p0 + ',handlerUserId=' + #p1",
+ appendRequestData = false
+ )
+ public R assigneeTask(@ApiParam(name = "id", value = "任务ID") Long id, @ApiParam(name = "handlerUserId", value = "处理人id") Long handlerUserId) {
Long assigneeUserId = tokenService.getLoginUser().getSysUser().getId();
- return xpTaskService.assigneeTask(id, handlerUserId,assigneeUserId);
+ return xpTaskService.assigneeTask(id, handlerUserId, assigneeUserId);
}
+
@ApiOperation(value = "创建任务事故")
@PostMapping("/saveTask")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ contentExpression = "'创建任务事故,vehicleIds=' + #p0.vehicleIds + ',taskTypeId=' + #p0.taskTypeId",
+ appendRequestData = false
+ )
public R saveTask(@RequestBody SaveErrorTaskDto dto) {
Long reportUserId = tokenService.getLoginUser().getSysUser().getId();
xpTaskService.saveTask(dto, reportUserId);
return R.ok();
}
+
@ApiOperation(value = "任务详情")
@GetMapping("/taskDetail")
- public R<TaskManagementDetailVO> taskDetail(Long id) {
+ public R<TaskManagementDetailVO> taskDetail(Long id) throws UnsupportedEncodingException {
return xpTaskService.taskDetail(id);
}
+
@ApiOperation(value = "查询车辆不分页列表")
- @PostMapping(" /listVehicle")
- public R<List<XpVehicle>> listVehicle() {
+ @PostMapping("/listVehicle")
+ public R<List<XpVehicle>> listVehicle() throws UnsupportedEncodingException {
List<XpVehicle> vehicles = xpVehicleClient.listVehicle().getData();
- if (vehicles == null){
+ if (vehicles == null) {
return R.ok(new ArrayList<>());
+ }
+ for (XpVehicle vehicle : vehicles) {
+ String vehiclePictures = vehicle.getVehiclePictures();
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(vehiclePictures)) {
+ JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ //1
+ 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);
+ vehicle.setVehiclePictures(jsonObject.toJSONString());
+ }
}
return R.ok(vehicles);
}
/**
* 通过车辆id查询任务事故分页列表
+ *
* @return
*/
@ApiOperation(value = "通过车辆id查询任务事故分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
@@ -177,7 +249,7 @@
@ApiOperation(value = "事故类型列表", response = XpErrorType.class, tags = "管理后台-车辆管理-运营车辆管理")
- @GetMapping(" /errorTypeTreeList")
+ @GetMapping("/errorTypeTreeList")
public R<List<XpErrorType>> errorTypeTreeList() {
return xpErrorTypeService.errorTypeList();
}
--
Gitblit v1.7.1