From 08f95b2f159b56fa3bd4f4b348855989de8aa456 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 18 十二月 2025 21:48:18 +0800
Subject: [PATCH] feat: vehicle
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleManagementController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleManagementController.java
index 9d47562..0d9b76a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleManagementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskVehicleManagementController.java
@@ -142,7 +142,7 @@
@PostMapping("/assign")
public AjaxResult assignVehicle(@RequestBody AssignVehicleRequest request) {
try {
- int result = sysTaskVehicleService.assignVehicleToTask(request.getTaskId(), request.getVehicleId(), request.getRemark());
+ int result = sysTaskVehicleService.assignVehicleToTask(request.getTaskId(), request.getVehicleId(), request.getRemark(), getUserId(), getUsername());
if (result > 0) {
return success("鍒嗛厤鎴愬姛");
} else {
@@ -161,7 +161,7 @@
@PostMapping("/assign-batch")
public AjaxResult assignVehicles(@RequestBody BatchAssignVehicleRequest request) {
try {
- int result = sysTaskVehicleService.assignMultipleVehiclesToTask(request.getTaskId(), request.getVehicleIds(), request.getRemark());
+ int result = sysTaskVehicleService.assignMultipleVehiclesToTask(request.getTaskId(), request.getVehicleIds(), request.getRemark(), getUserId(), getUsername());
if (result > 0) {
return success("鎵归噺鍒嗛厤鎴愬姛锛屽叡鍒嗛厤 " + result + " 杈嗚溅");
} else {
@@ -199,7 +199,7 @@
@PutMapping("/status/{id}")
public AjaxResult updateStatus(@PathVariable("id") Long id, @RequestParam String status) {
try {
- int result = sysTaskVehicleService.updateTaskVehicleStatus(id, status);
+ int result = sysTaskVehicleService.updateSysTaskVehicleStatus(id, status);
if (result > 0) {
return success("鐘舵�佹洿鏂版垚鍔�");
} else {
@@ -211,6 +211,22 @@
}
/**
+ * 鎵归噺鑾峰彇杞﹁締褰撳墠浠诲姟鐘舵��
+ * 浼樺寲鎺ュ彛锛氬噺灏慔TTP璇锋眰娆℃暟
+ */
+ @PreAuthorize("@ss.hasPermi('task:vehicle:query')")
+ @PostMapping("/currentStatus")
+ public AjaxResult batchGetCurrentTaskStatus(@RequestBody List<Long> vehicleIds) {
+ try {
+ java.util.Map<Long, java.util.Map<String, Object>> statusMap = sysTaskVehicleService.batchGetVehicleCurrentTaskStatus(vehicleIds);
+ return success(statusMap);
+ } catch (Exception e) {
+ logger.error("鎵归噺鑾峰彇杞﹁締浠诲姟鐘舵�佸け璐�", e);
+ return error("鑾峰彇鐘舵�佸け璐ワ細" + e.getMessage());
+ }
+ }
+
+ /**
* 鍒嗛厤杞﹁締璇锋眰瀵硅薄
*/
public static class AssignVehicleRequest {
--
Gitblit v1.9.1