From c459808efab29dc1b8439fbb90556bdb16f4c88b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 01 四月 2026 22:40:59 +0800
Subject: [PATCH] feat: 优化支付时显示任务ID
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java | 265 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 249 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
index 8d94003..6cb05ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
@@ -1,12 +1,19 @@
package com.ruoyi.web.controller.task;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.service.ILegacySystemSyncService;
+import com.ruoyi.system.service.ITaskDispatchSyncService;
+import com.ruoyi.system.mapper.SysTaskStatusHistoryMapper;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +34,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskStatusHistory;
import com.ruoyi.system.domain.VehicleInfo;
import com.ruoyi.system.domain.vo.TaskQueryVO;
import com.ruoyi.system.domain.vo.TaskCreateVO;
@@ -67,6 +75,18 @@
@Qualifier("tiandituMapService")
private IMapService mapService;
+ @Autowired
+ private ILegacySystemSyncService legacySystemSyncService;
+
+ @Autowired
+ private ITaskDispatchSyncService taskDispatchSyncService;
+
+ @Autowired
+ private ITaskStatusPushService taskStatusPushService;
+
+ @Autowired
+ private SysTaskStatusHistoryMapper sysTaskStatusHistoryMapper;
+
/**
* 鏌ヨ浠诲姟绠＄悊鍒楄〃锛堝悗鍙扮鐞嗙锛�
* 绠＄悊鍛樻潈闄愶紝鍙互鏌ョ湅鎵�鏈変换鍔�
@@ -80,7 +100,7 @@
List<SysTask> list;
if(searchTaskCode != null && !searchTaskCode.trim().isEmpty()){
// Search across task_code, emergency_info.dispatch_code, and emergency_info.service_code
- list = sysTaskService.selectSysTaskListByMultiCode(queryVO, searchTaskCode);
+ list = sysTaskService.selectSysTaskListByMultiCode(queryVO, searchTaskCode.trim());
} else {
queryVO.setTaskCode(null);
list = sysTaskService.selectSysTaskList(queryVO);
@@ -180,10 +200,9 @@
@Log(title = "浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/admin")
public AjaxResult adminAdd(@RequestBody TaskCreateVO createVO) {
- return toAjax(sysTaskService.insertSysTask(createVO));
+ Long taskId = sysTaskService.insertSysTask(createVO);
+ return taskId > 0 ? AjaxResult.success("鏂板鎴愬姛").put("taskId", taskId) : AjaxResult.error("鏂板澶辫触");
}
-
-
/**
* 鏂板浠诲姟锛圓PP绔級
@@ -191,7 +210,32 @@
@Log(title = "浠诲姟鍒涘缓", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult appAdd(@RequestBody TaskCreateVO createVO) {
- return toAjax(sysTaskService.insertSysTask(createVO));
+ Long taskId = sysTaskService.insertSysTask(createVO);
+ return taskId > 0 ? AjaxResult.success("鏂板鎴愬姛").put("taskId", taskId) : AjaxResult.error("鏂板澶辫触");
+ }
+
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹂噸澶嶏紙鏍规嵁鑱旂郴浜虹數璇濆拰鍒涘缓鏃ユ湡锛�
+ * @param phone 鑱旂郴浜虹數璇�
+ * @param createDate 浠诲姟鍒涘缓鏃ユ湡锛堟牸寮忥細YYYY-MM-DD锛�
+ * @return 鏄惁瀛樺湪閲嶅浠诲姟
+ */
+ @GetMapping("/checkDuplicate")
+ public AjaxResult checkDuplicate(
+ @RequestParam("phone") String phone,
+ @RequestParam("createDate") String createDate) {
+
+ if (StringUtils.isEmpty(phone) || StringUtils.isEmpty(createDate)) {
+ return AjaxResult.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ boolean isDuplicate = sysTaskService.checkTaskDuplicate(phone, createDate);
+
+ if (isDuplicate) {
+ return AjaxResult.error("璇ヨ仈绯荤數璇濆湪璇ユ棩鏈熷凡鏈変换鍔★紝涓嶈兘閲嶅鎻愪氦");
+ }
+
+ return AjaxResult.success("鏈彂鐜伴噸澶嶄换鍔�");
}
/**
@@ -282,26 +326,48 @@
sysTaskService.saveCancelInfo(taskId, request.getCancelReason());
}
+ // 濡傛灉鏄己鍒跺畬鎴愶紝鏇存柊瀹為檯寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ if (newStatus == TaskStatus.COMPLETED && request.getActualStartTime() != null && request.getActualEndTime() != null) {
+ SysTask task = new SysTask();
+ task.setTaskId(taskId);
+ task.setTaskStatus(newStatus.getCode());
+ //灏哠tring杞垚Date
+
+ task.setActualStartTime(DateUtils.parseDate(request.getActualStartTime()));
+ task.setActualEndTime(DateUtils.parseDate(request.getActualEndTime()));
+ task.setRemark(request.getRemark());
+ task.setUpdateBy(SecurityUtils.getUsername());
+ task.setUpdateTime(DateUtils.getNowDate());
+
+ int result = sysTaskService.forceCompleteTask(task);
+ return toAjax(result);
+ }
+
// 濡傛灉鍖呭惈GPS浣嶇疆淇℃伅锛屼娇鐢ㄥ甫浣嶇疆鐨勬柟娉�
if (request.getLatitude() != null && request.getLongitude() != null) {
String address= mapService.reverseGeocoding(request.getLongitude(), request.getLatitude());
request.setLocationAddress(address);
- SysTaskLog locationLog = new SysTaskLog();
- locationLog.setLatitude(request.getLatitude());
- locationLog.setLongitude(request.getLongitude());
- locationLog.setLocationAddress(request.getLocationAddress());
- locationLog.setLocationProvince(request.getLocationProvince());
- locationLog.setLocationCity(request.getLocationCity());
- locationLog.setLocationDistrict(request.getLocationDistrict());
- locationLog.setGpsAccuracy(request.getGpsAccuracy());
- locationLog.setAltitude(request.getAltitude());
- locationLog.setSpeed(request.getSpeed());
- locationLog.setHeading(request.getHeading());
+ SysTaskLog locationLog = getLocationLog(request);
return toAjax(sysTaskService.changeTaskStatusWithLocation(taskId, newStatus, request.getRemark(), locationLog));
}
return toAjax(sysTaskService.changeTaskStatus(taskId, newStatus, request.getRemark()));
+ }
+
+ private static SysTaskLog getLocationLog(ChangeStatusRequest request) {
+ SysTaskLog locationLog = new SysTaskLog();
+ locationLog.setLatitude(request.getLatitude());
+ locationLog.setLongitude(request.getLongitude());
+ locationLog.setLocationAddress(request.getLocationAddress());
+ locationLog.setLocationProvince(request.getLocationProvince());
+ locationLog.setLocationCity(request.getLocationCity());
+ locationLog.setLocationDistrict(request.getLocationDistrict());
+ locationLog.setGpsAccuracy(request.getGpsAccuracy());
+ locationLog.setAltitude(request.getAltitude());
+ locationLog.setSpeed(request.getSpeed());
+ locationLog.setHeading(request.getHeading());
+ return locationLog;
}
/**
@@ -438,6 +504,12 @@
// 鍙栨秷鐩稿叧瀛楁
private String cancelReason; // 鍙栨秷鍘熷洜锛堝叧鑱旀暟鎹瓧鍏竧ask_cancel_reason锛�
+
+ // 寮哄埗瀹屾垚鐩稿叧瀛楁
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private String actualStartTime; // 瀹為檯寮�濮嬫椂闂�
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private String actualEndTime; // 瀹為檯缁撴潫鏃堕棿
public String getTaskStatus() {
return taskStatus;
@@ -542,5 +614,166 @@
public void setCancelReason(String cancelReason) {
this.cancelReason = cancelReason;
}
+
+ public String getActualStartTime() {
+ return actualStartTime;
+ }
+
+ public void setActualStartTime(String actualStartTime) {
+ this.actualStartTime = actualStartTime;
+ }
+
+ public String getActualEndTime() {
+ return actualEndTime;
+ }
+
+ public void setActualEndTime(String actualEndTime) {
+ this.actualEndTime = actualEndTime;
+ }
+ }
+
+ /**
+ * 鎵嬪姩鍚屾鏈嶅姟鍗曞埌鏃х郴缁�
+ * 褰撴湇鍔″崟鍚屾澶辫触鎴栨湭鍚屾鏃讹紝鍙互閫氳繃姝ゆ帴鍙ｆ墜鍔ㄨЕ鍙戝悓姝�
+ */
+// @PreAuthorize("@ss.hasPermi('task:general:edit')")
+ @Log(title = "鎵嬪姩鍚屾鏈嶅姟鍗�", businessType = BusinessType.UPDATE)
+ @PostMapping("/syncServiceOrder/{taskId}")
+ public AjaxResult syncServiceOrder(@PathVariable Long taskId) {
+ try {
+ // 鏌ヨ浠诲姟淇℃伅
+ SysTask task = sysTaskService.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ return error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙敮鎸佹�ユ晳杞繍浠诲姟
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return error("鍙湁鎬ユ晳杞繍浠诲姟鎵嶈兘鍚屾鍒版棫绯荤粺");
+ }
+
+ // 璋冪敤鍚屾鏈嶅姟
+ Long serviceOrdId = legacySystemSyncService.syncEmergencyTaskToLegacy(taskId);
+
+ if (serviceOrdId != null && serviceOrdId > 0) {
+ return success("鏈嶅姟鍗曞悓姝ユ垚鍔燂紝ServiceOrdID: " + serviceOrdId);
+ } else {
+ return error("鏈嶅姟鍗曞悓姝ュけ璐ワ紝璇锋煡鐪嬪悓姝ラ敊璇俊鎭�");
+ }
+
+ } catch (Exception e) {
+ logger.error("鎵嬪姩鍚屾鏈嶅姟鍗曞紓甯革紝taskId: {}", taskId, e);
+ return error("鍚屾寮傚父: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 鎵嬪姩鍚屾璋冨害鍗曞埌鏃х郴缁�
+ * 褰撹皟搴﹀崟鍚屾澶辫触鎴栨湭鍚屾鏃讹紝鍙互閫氳繃姝ゆ帴鍙ｆ墜鍔ㄨЕ鍙戝悓姝�
+ */
+ @PreAuthorize("@ss.hasPermi('task:general:edit')")
+ @Log(title = "鎵嬪姩鍚屾璋冨害鍗�", businessType = BusinessType.UPDATE)
+ @PostMapping("/syncDispatchOrder/{taskId}")
+ public AjaxResult syncDispatchOrder(@PathVariable Long taskId) {
+ try {
+ // 鏌ヨ浠诲姟淇℃伅
+ SysTask task = sysTaskService.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ return error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙敮鎸佹�ユ晳杞繍浠诲姟
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return error("鍙湁鎬ユ晳杞繍浠诲姟鎵嶈兘鍚屾鍒版棫绯荤粺");
+ }
+
+ // 鏌ヨ鎬ユ晳杞繍鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysTaskEmergencyService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return error("鎬ユ晳杞繍鎵╁睍淇℃伅涓嶅瓨鍦�");
+ }
+
+ // 蹇呴』鍏堟湁鏈嶅姟鍗�
+ if (emergency.getLegacyServiceOrdId() == null || emergency.getLegacyServiceOrdId() <= 0) {
+ return error("璇峰厛鍚屾鏈嶅姟鍗�");
+ }
+
+ // 璋冪敤鍚屾鏈嶅姟
+ Long dispatchOrdId = taskDispatchSyncService.syncDispatch(taskId);
+
+ if (dispatchOrdId != null && dispatchOrdId > 0) {
+ return success("璋冨害鍗曞悓姝ユ垚鍔燂紝DispatchOrdID: " + dispatchOrdId);
+ } else {
+ return error("璋冨害鍗曞悓姝ュけ璐ワ紝璇锋煡鐪嬪悓姝ラ敊璇俊鎭�");
+ }
+
+ } catch (Exception e) {
+ logger.error("鎵嬪姩鍚屾璋冨害鍗曞紓甯革紝taskId: {}", taskId, e);
+ return error("鍚屾寮傚父: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 鎵嬪姩鍚屾浠诲姟鐘舵�佸埌鏃х郴缁�
+ * 褰撲换鍔＄姸鎬佸彉鏇村悗鐢变簬缃戠粶绛夊師鍥犳湭鍚屾鍒版棫绯荤粺鏃讹紝鍙互閫氳繃姝ゆ帴鍙ｆ墜鍔ㄨЕ鍙戝悓姝�
+ */
+// @PreAuthorize("@ss.hasPermi('task:general:edit')")
+ @Log(title = "鎵嬪姩鍚屾浠诲姟鐘舵��", businessType = BusinessType.UPDATE)
+ @PostMapping("/syncTaskStatus/{taskId}")
+ public AjaxResult syncTaskStatus(@PathVariable Long taskId) {
+ try {
+ // 鏌ヨ浠诲姟淇℃伅
+ SysTask task = sysTaskService.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ return error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙敮鎸佹�ユ晳杞繍浠诲姟
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return error("鍙湁鎬ユ晳杞繍浠诲姟鎵嶈兘鍚屾鍒版棫绯荤粺");
+ }
+
+ // 鏌ヨ鎬ユ晳杞繍鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysTaskEmergencyService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return error("鎬ユ晳杞繍鎵╁睍淇℃伅涓嶅瓨鍦�");
+ }
+
+ // 蹇呴』鍏堟湁璋冨害鍗�
+ if (emergency.getLegacyDispatchOrdId() == null || emergency.getLegacyDispatchOrdId() <= 0) {
+ return error("璇峰厛鍚屾璋冨害鍗曪紝浠诲姟鐘舵�佷俊鎭悓姝ュ埌鏃х郴缁熺殑璋冨害鍗曚腑");
+ }
+
+ // 璋冪敤鐘舵�佸悓姝ユ湇鍔�
+ boolean success = taskStatusPushService.pushTaskStatusToLegacy(taskId);
+
+ if (success) {
+ return success("浠诲姟鐘舵�佸悓姝ユ垚鍔�");
+ } else {
+ return error("浠诲姟鐘舵�佸悓姝ュけ璐ワ紝璇锋煡鐪嬫棩蹇楄幏鍙栬缁嗕俊鎭�");
+ }
+
+ } catch (Exception e) {
+ logger.error("鎵嬪姩鍚屾浠诲姟鐘舵�佸紓甯革紝taskId: {}", taskId, e);
+ return error("鍚屾寮傚父: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 鏌ヨ浠诲姟鐘舵�佸彉鏇村巻鍙�
+ */
+ @GetMapping("/{taskId}/statusHistory")
+ public AjaxResult getTaskStatusHistory(@PathVariable Long taskId) {
+ try {
+ SysTask task = sysTaskService.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ return error("浠诲姟涓嶅瓨鍦�");
+ }
+ List<SysTaskStatusHistory> list = sysTaskStatusHistoryMapper.selectByTaskId(taskId);
+ return success(list);
+ } catch (Exception e) {
+ logger.error("鏌ヨ浠诲姟鐘舵�佸巻鍙插紓甯革紝taskId: {}", taskId, e);
+ return error("鏌ヨ澶辫触: " + e.getMessage());
+ }
}
}
--
Gitblit v1.9.1