From 5f2ee03958a1a16dc27195c76ea7cffb422c95d1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 19 十二月 2025 22:40:34 +0800
Subject: [PATCH] feat: 任务修改接口，删除一些不要的字段同步
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskVehicleService.java | 154 ++++++++++++++++++++++++++++-----------------------
1 files changed, 85 insertions(+), 69 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskVehicleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskVehicleService.java
index 0e1ec8b..98f0e82 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskVehicleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskVehicleService.java
@@ -1,24 +1,17 @@
package com.ruoyi.system.service;
-import java.util.List;
-import java.util.Map;
import com.ruoyi.system.domain.SysTaskVehicle;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
/**
- * 浠诲姟杞﹁締鍏宠仈Service鎺ュ彛
+ * 浠诲姟杞﹁締鏈嶅姟鎺ュ彛
*
* @author ruoyi
- * @date 2024-01-15
*/
public interface ISysTaskVehicleService {
-
- /**
- * 鏌ヨ浠诲姟杞﹁締鍏宠仈
- *
- * @param id 浠诲姟杞﹁締鍏宠仈涓婚敭
- * @return 浠诲姟杞﹁締鍏宠仈
- */
- public SysTaskVehicle selectSysTaskVehicleById(Long id);
/**
* 鏌ヨ浠诲姟杞﹁締鍏宠仈鍒楄〃
@@ -26,7 +19,15 @@
* @param sysTaskVehicle 浠诲姟杞﹁締鍏宠仈
* @return 浠诲姟杞﹁締鍏宠仈闆嗗悎
*/
- public List<SysTaskVehicle> selectSysTaskVehicleList(SysTaskVehicle sysTaskVehicle);
+ List<SysTaskVehicle> selectSysTaskVehicleList(SysTaskVehicle sysTaskVehicle);
+
+ /**
+ * 鏌ヨ浠诲姟杞﹁締鍏宠仈淇℃伅
+ *
+ * @param id 浠诲姟杞﹁締鍏宠仈涓婚敭
+ * @return 浠诲姟杞﹁締鍏宠仈淇℃伅
+ */
+ SysTaskVehicle selectSysTaskVehicleById(Long id);
/**
* 鏍规嵁浠诲姟ID鏌ヨ鍏宠仈杞﹁締鍒楄〃
@@ -34,7 +35,7 @@
* @param taskId 浠诲姟ID
* @return 浠诲姟杞﹁締鍏宠仈闆嗗悎
*/
- public List<SysTaskVehicle> selectSysTaskVehicleByTaskId(Long taskId);
+ List<SysTaskVehicle> selectSysTaskVehicleByTaskId(Long taskId);
/**
* 鏂板浠诲姟杞﹁締鍏宠仈
@@ -42,7 +43,7 @@
* @param sysTaskVehicle 浠诲姟杞﹁締鍏宠仈
* @return 缁撴灉
*/
- public int insertSysTaskVehicle(SysTaskVehicle sysTaskVehicle);
+ int insertSysTaskVehicle(SysTaskVehicle sysTaskVehicle);
/**
* 淇敼浠诲姟杞﹁締鍏宠仈
@@ -50,15 +51,7 @@
* @param sysTaskVehicle 浠诲姟杞﹁締鍏宠仈
* @return 缁撴灉
*/
- public int updateSysTaskVehicle(SysTaskVehicle sysTaskVehicle);
-
- /**
- * 鎵归噺鍒犻櫎浠诲姟杞﹁締鍏宠仈
- *
- * @param ids 闇�瑕佸垹闄ょ殑浠诲姟杞﹁締鍏宠仈涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteSysTaskVehicleByIds(Long[] ids);
+ int updateSysTaskVehicle(SysTaskVehicle sysTaskVehicle);
/**
* 鍒犻櫎浠诲姟杞﹁締鍏宠仈淇℃伅
@@ -66,51 +59,73 @@
* @param id 浠诲姟杞﹁締鍏宠仈涓婚敭
* @return 缁撴灉
*/
- public int deleteSysTaskVehicleById(Long id);
+ int deleteSysTaskVehicleById(Long id);
/**
- * 鏍规嵁浠诲姟ID鍒犻櫎杞﹁締鍏宠仈
+ * 鎵归噺鍒犻櫎浠诲姟杞﹁締鍏宠仈淇℃伅
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ int deleteSysTaskVehicleByIds(Long[] ids);
+
+ /**
+ * 鏇存柊浠诲姟杞﹁締鍏宠仈鐘舵��
+ *
+ * @param id 浠诲姟杞﹁締鍏宠仈涓婚敭
+ * @param status 鐘舵��
+ * @return 缁撴灉
+ */
+ int updateSysTaskVehicleStatus(Long id, String status);
+
+ /**
+ * 鎵归噺鑾峰彇杞﹁締褰撳墠浠诲姟鐘舵��
+ *
+ * @param vehicleIds 杞﹁締ID鍒楄〃
+ * @return 杞﹁締浠诲姟鐘舵�佹槧灏�
+ */
+ Map<Long, Map<String, Object>> batchGetVehicleCurrentTaskStatus(List<Long> vehicleIds);
+
+ /**
+ * 淇濆瓨浠诲姟杞﹁締鍏宠仈
*
* @param taskId 浠诲姟ID
- * @return 缁撴灉
+ * @param vehicleIds 杞﹁締ID鍒楄〃
+ * @param userName 鎿嶄綔浜虹敤鎴峰悕
*/
- public int deleteSysTaskVehicleByTaskId(Long taskId);
+ void saveTaskVehicles(Long taskId, List<Long> vehicleIds, String userName);
/**
- * 鏍规嵁浠诲姟ID鍜岃溅杈咺D鍒犻櫎鍏宠仈
+ * 淇濆瓨浠诲姟杞﹁締鍏宠仈锛堟寚瀹氭椂闂达級
*
* @param taskId 浠诲姟ID
- * @param vehicleId 杞﹁締ID
- * @return 缁撴灉
+ * @param vehicleIds 杞﹁締ID鍒楄〃
+ * @param userName 鎿嶄綔浜虹敤鎴峰悕
+ * @param assignTime 鍒嗛厤鏃堕棿
+ * @param createTime 鍒涘缓鏃堕棿
+ * @param updateTime 鏇存柊鏃堕棿
*/
- public int deleteSysTaskVehicleByTaskIdAndVehicleId(Long taskId, Long vehicleId);
+ void saveTaskVehicles(Long taskId, List<Long> vehicleIds, String userName,
+ Date assignTime, Date createTime, Date updateTime);
/**
- * 妫�鏌ヤ换鍔¤溅杈嗗叧鑱旀槸鍚﹀瓨鍦�
+ * 鏇存柊浠诲姟杞﹁締鍏宠仈
*
* @param taskId 浠诲姟ID
- * @param vehicleId 杞﹁締ID
- * @return 缁撴灉
+ * @param newVehicleIds 鏂扮殑杞﹁締ID鍒楄〃
+ * @param userName 鎿嶄綔浜虹敤鎴峰悕
+ * @return 鏄惁鏈夊彉鏇�
*/
- public int checkTaskVehicleExists(Long taskId, Long vehicleId);
-
- /**
- * 鎵归噺鏂板浠诲姟杞﹁締鍏宠仈
- *
- * @param sysTaskVehicleList 浠诲姟杞﹁締鍏宠仈鍒楄〃
- * @return 缁撴灉
- */
- public int batchInsertSysTaskVehicle(List<SysTaskVehicle> sysTaskVehicleList);
-
- /**
- * 鍒嗛厤杞﹁締缁欎换鍔�
- *
+ boolean updateTaskVehicles(Long taskId, List<Long> newVehicleIds, String userName);
+ /*
* @param taskId 浠诲姟ID
* @param vehicleId 杞﹁締ID
* @param remark 澶囨敞
+ * @param userId 鎿嶄綔浜篒D
+ * @param userName 鎿嶄綔浜虹敤鎴峰悕
* @return 缁撴灉
*/
- public int assignVehicleToTask(Long taskId, Long vehicleId, String remark);
+ int assignVehicleToTask(Long taskId, Long vehicleId, String remark, Long userId, String userName);
/**
* 鍙栨秷浠诲姟杞﹁締鍒嗛厤
@@ -119,7 +134,7 @@
* @param vehicleId 杞﹁締ID
* @return 缁撴灉
*/
- public int unassignVehicleFromTask(Long taskId, Long vehicleId);
+ int unassignVehicleFromTask(Long taskId, Long vehicleId);
/**
* 鎵归噺鍒嗛厤杞﹁締缁欎换鍔�
@@ -127,9 +142,19 @@
* @param taskId 浠诲姟ID
* @param vehicleIds 杞﹁締ID鍒楄〃
* @param remark 澶囨敞
+ * @param userId 鎿嶄綔浜篒D
+ * @param userName 鎿嶄綔浜虹敤鎴峰悕
* @return 缁撴灉
*/
- public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark);
+ int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark, Long userId, String userName);
+
+ /**
+ * 鏌ヨ浠诲姟鍏宠仈鐨勮溅杈�
+ *
+ * @param taskId 浠诲姟ID
+ * @return 浠诲姟杞﹁締鍏宠仈鍒楄〃
+ */
+ List<SysTaskVehicle> getTaskVehicles(Long taskId);
/**
* 鏌ヨ鍙敤杞﹁締
@@ -138,31 +163,22 @@
* @param taskType 浠诲姟绫诲瀷
* @return 鍙敤杞﹁締鍒楄〃
*/
- public List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType);
+ List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType);
/**
- * 鏇存柊浠诲姟杞﹁締鍏宠仈鐘舵��
+ * 鍒犻櫎浠诲姟鐨勬墍鏈夎溅杈嗗叧鑱�
*
- * @param id 鍏宠仈ID
- * @param status 鏂扮姸鎬�
+ * @param taskId 浠诲姟ID
* @return 缁撴灉
*/
- public int updateTaskVehicleStatus(Long id, String status);
+ int deleteTaskVehiclesByTaskId(Long taskId);
/**
- * 鎵归噺鑾峰彇杞﹁締褰撳墠浠诲姟鐘舵��
+ * 妫�鏌ヨ溅杈嗘槸鍚﹀凡鍒嗛厤缁欎换鍔�
*
- * @param vehicleIds 杞﹁締ID鍒楄〃
- * @return Map<杞﹁締ID, Map<"taskCode": 浠诲姟缂栧彿, "taskStatus": 浠诲姟鐘舵��>>
+ * @param taskId 浠诲姟ID
+ * @param vehicleId 杞﹁締ID
+ * @return true-宸插垎閰嶏紝false-鏈垎閰�
*/
- public Map<Long, Map<String, Object>> batchGetVehicleCurrentTaskStatus(List<Long> vehicleIds);
-
- /**
- * 鏇存柊浠诲姟杞﹁締鍏宠仈鐘舵�侊紙鏂版柟娉曪級
- *
- * @param id 鍏宠仈ID
- * @param status 鏂扮姸鎬�
- * @return 缁撴灉
- */
- public int updateSysTaskVehicleStatus(Long id, String status);
+ boolean checkVehicleAssigned(Long taskId, Long vehicleId);
}
--
Gitblit v1.9.1