From 6676a35122fd9c97d1b1679c211bc8a9b97f08f2 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 24 三月 2026 23:17:37 +0800
Subject: [PATCH] feat: 增加日志记录历史消息
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 53 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
index 60aae88..c7c7048 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.system.domain.SysTaskVehicle;
import com.ruoyi.system.domain.SysTaskAttachment;
import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskStatusHistory;
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.domain.SysTaskWelfare;
import com.ruoyi.system.domain.SysTaskAssignee;
@@ -56,6 +57,9 @@
@Autowired
private SysTaskLogMapper sysTaskLogMapper;
+
+ @Autowired
+ private SysTaskStatusHistoryMapper sysTaskStatusHistoryMapper;
@Autowired
private SysTaskEmergencyMapper sysTaskEmergencyMapper;
@@ -189,7 +193,7 @@
}
/**
- * 鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃
+ *鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃锛圫QL绠楁硶涓嬫帹浼樺寲鐗堟湰锛�
*
* @param queryVO 浠诲姟鏌ヨ瀵硅薄
* @param taskCode 浠诲姟缂栧彿
@@ -197,52 +201,34 @@
*/
@Override
public List<SysTask> selectSysTaskListByMultiCode(TaskQueryVO queryVO, String taskCode) {
- // Create a new query object without the taskCode filter
- TaskQueryVO newQuery = new TaskQueryVO();
- // Copy all properties except taskCode
- try {
- org.springframework.beans.BeanUtils.copyProperties(queryVO, newQuery, "taskCode");
- } catch (Exception e) {
- // If copy fails, manually copy the important fields
- newQuery.setTaskType(queryVO.getTaskType());
- newQuery.setTaskStatus(queryVO.getTaskStatus());
- newQuery.setVehicleNo(queryVO.getVehicleNo());
- newQuery.setCreatorId(queryVO.getCreatorId());
- newQuery.setAssigneeId(queryVO.getAssigneeId());
- newQuery.setDeptId(queryVO.getDeptId());
- newQuery.setDeptIds(queryVO.getDeptIds());
- newQuery.setPlannedStartTimeBegin(queryVO.getPlannedStartTimeBegin());
- newQuery.setPlannedStartTimeEnd(queryVO.getPlannedStartTimeEnd());
- newQuery.setPlannedEndTimeBegin(queryVO.getPlannedEndTimeBegin());
- newQuery.setPlannedEndTimeEnd(queryVO.getPlannedEndTimeEnd());
- newQuery.setOverdue(queryVO.getOverdue());
- }
-
- // Get all tasks matching the other criteria
- List<SysTask> allTasks = sysTaskMapper.selectSysTaskList(newQuery);
- allTasks.stream().forEach(task -> {
-
+ // 璁剧疆浠诲姟鐮佺敤浜嶴QL鏌ヨ
+ queryVO.setTaskCode(taskCode);
+
+ // 浣跨敤浼樺寲鐨勬煡璇㈡柟娉曪紝鐩存帴鍦⊿QL涓叧鑱攕ys_task_emergency琛ㄥ苟璁＄畻鍖归厤鐨刣ispatchCode鍜宻erviceCode
+ List<SysTask> tasks = sysTaskMapper.selectSysTaskListByMultiCodeOptimized(queryVO);
+
+ // 澶勭悊浠诲姟鍒嗛厤淇℃伅鍜屾�ユ晳杞繍鎵╁睍淇℃伅
+ tasks.forEach(task -> {
+ bindTaskAssign(task);
+
+ // 瀵逛簬鎬ユ晳杞繍浠诲姟锛屼娇鐢⊿QL鏌ヨ涓凡璁＄畻骞跺尮閰嶅ソ鐨刣ispatchCode鍜宻erviceCode
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
- task.setEmergencyInfo(emergencyInfo);
+ // 鍒涘缓涓�涓复鏃剁殑emergencyInfo瀵硅薄锛屽寘鍚粠SQL鏌ヨ缁撴灉涓幏鍙栫殑璁＄畻鍚庣殑浠ｇ爜
+// SysTaskEmergency emergencyInfo = new SysTaskEmergency();
+// emergencyInfo.setDispatchCode(task.getDispatchCode());
+// emergencyInfo.setServiceCode(task.getServiceCode());
+
+ // 鍔犺浇瀹屾暣鐨勬墿灞曚俊鎭�
+ SysTaskEmergency fullEmergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
+ if (fullEmergencyInfo != null) {
+ // 淇濈暀瀹屾暣淇℃伅锛屼絾纭繚dispatchCode鍜宻erviceCode鏄绠楀悗鐨勫��
+ task.setEmergencyInfo(fullEmergencyInfo);
+ }
+
}
});
- return allTasks.stream().filter(task -> {
- if (task.getTaskCode() != null && task.getTaskCode().contains(taskCode)) {
- return true;
- }
- bindTaskAssign(task);
-
- if ("EMERGENCY_TRANSFER".equals(task.getTaskType()) && task.getEmergencyInfo() != null) {
- String dispatchCode = task.getEmergencyInfo().getDispatchCode();
- String serviceCode = task.getEmergencyInfo().getServiceCode();
- return (dispatchCode != null && dispatchCode.contains(taskCode)) ||
- (serviceCode != null && serviceCode.contains(taskCode));
- }
- return false;
-
- }).collect(Collectors.toList());
-
+
+ return tasks;
}
/**
@@ -252,14 +238,14 @@
* @return 缁撴灉
*/
@Override
- public int insertSysTask(TaskCreateVO createVO) {
+ public Long insertSysTask(TaskCreateVO createVO) {
// 鑾峰彇褰撳墠鐢ㄦ埛鍚嶅拰鐢ㄦ埛ID
String username = SecurityUtils.getUsername();
Long userId = SecurityUtils.getUserId();
// 鏍￠獙鐢ㄦ埛ID鏄惁涓虹┖鎴栦负0
if(userId==null || userId==0){
log.error("insertSysTask 鐢ㄦ埛ID涓虹┖ userName:{}",username);
- return 0;
+ return 0L;
}
SysTask task = new SysTask();
// 鍒涘缓鏂扮殑浠诲姟瀵硅薄
@@ -347,7 +333,7 @@
}).start();
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
/**
@@ -361,7 +347,7 @@
* @return 缁撴灉
*/
@Override
- public int insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
+ public Long insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
SysTask task = new SysTask();
if(createVO.getTaskCode()!=null){
task.setTaskCode(createVO.getTaskCode());
@@ -455,7 +441,7 @@
this.sendEmeryTaskProcess(task, dispatchOrderId);
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
@@ -698,6 +684,7 @@
if(deptId!=null){
task.setDeptId(deptId);
}
+
// task.setAssigneeId(updateVO.getAssigneeId());
@@ -968,6 +955,15 @@
recordTaskLog(task.getTaskId(), "FORCE_COMPLETE", "寮哄埗瀹屾垚浠诲姟",
oldStatus, task.getTaskStatus(),
SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ // 鍐欏叆鐘舵�佸彉鏇村巻鍙茶褰�
+ recordStatusHistory(oldTask, oldStatus,
+ oldTaskStatus != null ? oldTaskStatus.getInfo() : oldStatus,
+ task.getTaskStatus(),
+ TaskStatus.getByCode(task.getTaskStatus()) != null ? TaskStatus.getByCode(task.getTaskStatus()).getInfo() : task.getTaskStatus(),
+ task.getRemark(),
+ SysTaskStatusHistory.SOURCE_APP,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+ null);
// 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
TaskStatus newTaskStatus = TaskStatus.getByCode(task.getTaskStatus());
@@ -1040,6 +1036,12 @@
"鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark,
SecurityUtils.getUserId(), SecurityUtils.getUsername(),
locationLog);
+ // 鍐欏叆鐘舵�佸彉鏇村巻鍙茶褰�
+ recordStatusHistory(oldTask, oldTaskStatus.getCode(), oldTaskStatus.getInfo(),
+ newStatus.getCode(), newStatus.getInfo(), remark,
+ SysTaskStatusHistory.SOURCE_APP,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+ locationLog);
}
// 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
@@ -1503,6 +1505,51 @@
}
/**
+ * 璁板綍浠诲姟鐘舵�佸彉鏇村巻鍙�
+ *
+ * @param task 浠诲姟瀵硅薄锛堝彇 task_id / task_code锛�
+ * @param fromStatus 鍙樻洿鍓嶇姸鎬佺爜
+ * @param fromStatusName 鍙樻洿鍓嶇姸鎬佸悕绉�
+ * @param toStatus 鍙樻洿鍚庣姸鎬佺爜
+ * @param toStatusName 鍙樻洿鍚庣姸鎬佸悕绉�
+ * @param changeReason 鍙樻洿鍘熷洜/澶囨敞
+ * @param changeSource 瑙﹀彂鏉ユ簮锛圓PP / ADMIN / SYSTEM / LEGACY锛�
+ * @param operatorId 鎿嶄綔浜� ID
+ * @param operatorName 鎿嶄綔浜哄鍚�
+ * @param locationLog GPS 浣嶇疆淇℃伅锛堝彲涓� null锛�
+ */
+ private void recordStatusHistory(SysTask task,
+ String fromStatus, String fromStatusName,
+ String toStatus, String toStatusName,
+ String changeReason, String changeSource,
+ Long operatorId, String operatorName,
+ SysTaskLog locationLog) {
+ try {
+ SysTaskStatusHistory history = new SysTaskStatusHistory();
+ history.setTaskId(task.getTaskId());
+ history.setTaskCode(task.getTaskCode());
+ history.setFromStatus(fromStatus);
+ history.setFromStatusName(fromStatusName);
+ history.setToStatus(toStatus);
+ history.setToStatusName(toStatusName);
+ history.setChangeReason(changeReason);
+ history.setChangeSource(changeSource != null ? changeSource : SysTaskStatusHistory.SOURCE_APP);
+ history.setOperatorId(operatorId);
+ history.setOperatorName(operatorName);
+ history.setChangeTime(DateUtils.getNowDate());
+ history.setIpAddress("127.0.0.1");
+ if (locationLog != null) {
+ history.setLongitude(locationLog.getLongitude());
+ history.setLatitude(locationLog.getLatitude());
+ history.setLocationAddress(locationLog.getLocationAddress());
+ }
+ sysTaskStatusHistoryMapper.insert(history);
+ } catch (Exception e) {
+ log.error("璁板綍浠诲姟鐘舵�佸彉鏇村巻鍙插け璐�, taskId={}", task.getTaskId(), e);
+ }
+ }
+
+ /**
* 鏋勫缓浠诲姟鎻忚堪
*
* @param task 浠诲姟瀵硅薄
@@ -1652,6 +1699,13 @@
}
}
+ private AjaxResult getCheckCanSuccess(){
+ List<Map<String, Object>> conflicts = new ArrayList<>();
+ Map<String, Object> result = new HashMap<>();
+ result.put("valid", conflicts.isEmpty());
+ result.put("conflicts", conflicts);
+ return AjaxResult.success(result);
+ }
/**
* 妫�鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙�
* 妫�鏌ワ細
@@ -1663,13 +1717,18 @@
*/
@Override
public AjaxResult checkTaskCanDepart(Long taskId) {
+ return getCheckCanSuccess();
+ }
+
+ public AjaxResult checkTaskCanDepartOld(Long taskId) {
+ List<Map<String, Object>> conflicts = new ArrayList<>();
+ Map<String, Object> result = new HashMap<>();
+
// 鑾峰彇浠诲姟璇︽儏
SysTask task = this.getTaskDetail(taskId);
if (task == null) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
-
- List<Map<String, Object>> conflicts = new ArrayList<>();
// 1. 妫�鏌ヨ溅杈嗘槸鍚︽湁鏈畬鎴愮殑浠诲姟
List<SysTaskVehicle> taskVehicles = task.getAssignedVehicles();
@@ -1745,8 +1804,7 @@
}
}
- // 杩斿洖缁撴灉
- Map<String, Object> result = new HashMap<>();
+
result.put("valid", conflicts.isEmpty());
result.put("conflicts", conflicts);
--
Gitblit v1.9.1