From 6f55da80d19cba61bd23cd302b76bbb23038f7bd Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期二, 21 四月 2026 12:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
index 6c92d4c..93ff612 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.xiaopeng.api.dto.account.XpOperationsUserPositionDTO;
+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.XpOperationsUser;
@@ -28,10 +30,9 @@
import com.xiaopeng.maintenance.schedule.InsuranceInspectionScheduleTask;
import com.xiaopeng.maintenance.service.IXpErrorTypeService;
import com.xiaopeng.maintenance.service.XpTaskService;
+import com.xiaopeng.maintenance.vo.*;
import com.xiaopeng.maintenance.vo.TaskCleanDetailVO;
import com.xiaopeng.maintenance.vo.TaskDetectionDetailVO;
-import com.xiaopeng.maintenance.vo.TaskReassignVo;
-import com.xiaopeng.maintenance.vo.VehicleListVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@@ -39,7 +40,11 @@
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Metrics;
import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.transaction.annotation.Transactional;
@@ -49,10 +54,10 @@
import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-
-import static net.sf.jsqlparser.parser.feature.Feature.comment;
+import java.util.stream.Collectors;
/**
* <p>
@@ -299,7 +304,38 @@
return R.ok(xpTask);
}
+ @ApiOperation(value = "待改派的工单分页列表", tags = {"管理后台-运维执行-任务工单-待改派工单"})
+ @PostMapping("/api/v1/task/reassign/pageList")
+ public R<PageInfo<TaskVO>> reassignTaskPageList(@RequestBody TaskPageListQuery query) {
+ return R.ok(xpTaskService.reassignTaskPageList(query));
+ }
+ @ApiOperation(value = "可改派的运维人员列表", tags = {"管理后台-运维执行-任务工单-待改派工单"})
+ @GetMapping("/api/v1/task/reassign/availableUsers")
+ public R<List<XpOperationsUser>> availableReassignUsers(@RequestParam Long taskId) {
+
+ XpTask task = xpTaskService.getById(taskId);
+ GeoJsonPoint point =
+ new GeoJsonPoint(
+ task.getVehicleLon().doubleValue(),
+ task.getVehicleLat().doubleValue()
+ );
+ Query query = new Query(Criteria.where("location").near(point)
+ .maxDistance(new Distance(10, Metrics.KILOMETERS).getNormalizedValue()));
+ query.with(Sort.by(Sort.Direction.ASC, "dis"));
+ List<Long> ids = mongoTemplate.find(query, XpOperationsUserPositionDTO.class)
+ .stream().map(XpOperationsUserPositionDTO::getId).collect(Collectors.toList());
+ return R.ok(operationUserClient.listByIds(ids).getData());
+ }
+
+ @Resource
+ private XpOperationUserClient operationUserClient;
+
+ @ApiOperation(value = "改派详情", tags = {"管理后台-运维执行-任务工单-待改派工单"})
+ @GetMapping("/api/v1/task/reassign/detail")
+ public R<TaskReassignDetailVO> reassignDetail(@RequestParam Long taskId) {
+ return R.ok(xpTaskService.detail(taskId));
+ }
@ApiOperation(value = "执行保险年检检测定时任务", tags = {"定时任务"})
@GetMapping("/base/task/insurance/execute")
@@ -307,5 +343,4 @@
insuranceInspectionScheduleTask.executeInsuranceInspectionTask();
return R.ok();
}
-
}
--
Gitblit v1.7.1