From 0a3eed02e78dfeeb7763a4b62992eefcd1f5a0ca Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 23 十二月 2025 23:33:34 +0800
Subject: [PATCH] feat: 优化状态变更时实时推送
---
ruoyi-system/src/main/java/com/ruoyi/system/service/IDispatchOrdService.java | 3
app/pages/index.vue | 95 ++++++++++++++++++++++-
ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java | 6 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java | 6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacySystemSyncServiceImpl.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java | 2
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 30 ++++---
app/utils/taskValidator.js | 4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/LegacySystemSyncTask.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacyTransferSyncServiceImpl.java | 6
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/ITaskStatusPushService.java | 4 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java | 17 ++--
15 files changed, 141 insertions(+), 48 deletions(-)
diff --git a/app/pages/index.vue b/app/pages/index.vue
index caf793a..46ca76b 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -243,6 +243,7 @@
import { getUnreadCount } from "@/api/message";
import { formatDateTime } from "@/utils/common";
import subscribeManager from "@/utils/subscribe";
+import { checkTaskCanDepart } from "@/utils/taskValidator";
export default {
data() {
@@ -613,16 +614,96 @@
},
// 澶勭悊浠诲姟鎿嶄綔
- handleTaskAction(task, action) {
+ async handleTaskAction(task, action) {
switch (action) {
case "depart":
// 鍑哄彂 -> 鐘舵�佸彉涓哄嚭鍙戜腑
- this.$modal
- .confirm("纭畾瑕佸嚭鍙戝悧锛�")
- .then(() => {
- this.updateTaskStatus(task.taskId, "DEPARTING", "浠诲姟宸插嚭鍙�");
- })
- .catch(() => {});
+ // 鏄剧ず鍔犺浇鎻愮ず
+ uni.showLoading({
+ title: "妫�鏌ヤ换鍔＄姸鎬�...",
+ });
+
+ try {
+ // 璋冪敤宸ュ叿绫绘鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙戯紙鍖呭惈鍩烘湰鏍￠獙鍜屽啿绐佹鏌ワ級
+ const checkResult = await checkTaskCanDepart(task);
+
+ uni.hideLoading();
+
+ console.log("鍑哄彂妫�鏌ョ粨鏋�:", checkResult);
+ console.log("valid:", checkResult.valid);
+ console.log("conflicts:", checkResult.conflicts);
+
+ if (!checkResult.valid) {
+ // 鏍￠獙澶辫触锛屾樉绀烘彁绀轰俊鎭苟鎻愪緵璺宠浆閫夐」
+ const conflicts = checkResult.conflicts || [];
+ const conflictInfo = conflicts.length > 0 ? conflicts[0] : null;
+
+ console.log("鍐茬獊淇℃伅:", conflictInfo);
+
+ // 濡傛灉鏈夊啿绐佷换鍔′俊鎭紝鎻愪緵璺宠浆鎸夐挳
+ if (conflictInfo && conflictInfo.taskId) {
+ console.log(
+ "鏄剧ず甯﹁烦杞寜閽殑寮圭獥锛屼换鍔D:",
+ conflictInfo.taskId
+ );
+
+ const conflictTaskId = conflictInfo.taskId;
+ const message =
+ checkResult.message || conflictInfo.message || "瀛樺湪鍐茬獊浠诲姟";
+
+ uni.showModal({
+ title: "鎻愮ず",
+ content: message,
+ confirmText: "鍘诲鐞�",
+ cancelText: "鐭ラ亾浜�",
+ success: function (res) {
+ console.log("寮圭獥鐐瑰嚮缁撴灉:", res);
+ if (res.confirm) {
+ // 鐢ㄦ埛鐐瑰嚮"鐜板湪鍘诲鐞�"锛岃烦杞埌鍐茬獊浠诲姟璇︽儏椤�
+ console.log("鍑嗗璺宠浆鍒颁换鍔¤鎯呴〉:", conflictTaskId);
+ uni.navigateTo({
+ url: `/pagesTask/detail?id=${conflictTaskId}`,
+ });
+ }
+ },
+ fail: function (err) {
+ console.error("鏄剧ず寮圭獥澶辫触:", err);
+ },
+ });
+ } else {
+ // 娌℃湁鍐茬獊浠诲姟ID锛屽彧鏄剧ず鎻愮ず
+ console.log("鏄剧ず鏅�氭彁绀哄脊绐�");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: checkResult.message || "浠诲姟鏍￠獙澶辫触",
+ showCancel: false,
+ confirmText: "鐭ラ亾浜�",
+ fail: function (err) {
+ console.error("鏄剧ず寮圭獥澶辫触:", err);
+ },
+ });
+ }
+ return;
+ }
+
+ // 鎵�鏈夋鏌ラ�氳繃锛屽彲浠ュ嚭鍙�
+ this.$modal
+ .confirm("纭畾瑕佸嚭鍙戝悧锛�")
+ .then(() => {
+ this.updateTaskStatus(task.taskId, "DEPARTING", "浠诲姟宸插嚭鍙�");
+ })
+ .catch(() => {});
+ } catch (error) {
+ uni.hideLoading();
+ console.error("妫�鏌ヤ换鍔＄姸鎬佸け璐�:", error);
+ // 妫�鏌ュけ璐ユ椂锛屼粛鐒跺厑璁稿嚭鍙�
+ this.$modal
+ .confirm("妫�鏌ヤ换鍔＄姸鎬佸け璐ワ紝鏄惁缁х画鍑哄彂锛�")
+ .then(() => {
+ this.updateTaskStatus(task.taskId, "DEPARTING", "浠诲姟宸插嚭鍙�");
+ })
+ .catch(() => {});
+ }
break;
case "cancel":
diff --git a/app/utils/taskValidator.js b/app/utils/taskValidator.js
index c52bc0c..8042f5e 100644
--- a/app/utils/taskValidator.js
+++ b/app/utils/taskValidator.js
@@ -97,8 +97,8 @@
}
}
- // 妫�鏌ユ槸鍚︿负鏃犳晥鏃堕棿锛�1900骞达級
- if (task.plannedStartTime.startsWith('1900')) {
+ // 妫�鏌ユ槸鍚︿负鏃犳晥鏃堕棿锛�1900骞存垨1970骞达級
+ if (task.plannedStartTime.startsWith('1900') || task.plannedStartTime.startsWith('1970')) {
return {
valid: false,
message: '浠诲姟鐨勮浆杩愭椂闂存棤鏁�',
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4219d2c..105bc73 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -58,7 +58,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: prod
+ active: dev
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 3cc8d9f..4bd8aa3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -103,7 +103,7 @@
try
{
String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url;
- log.info("sendGet - {}", urlNameString);
+// log.info("sendGet - {}", urlNameString);
URL realUrl = new URL(urlNameString);
URLConnection connection = realUrl.openConnection();
connection.setRequestProperty("accept", "*/*");
@@ -116,7 +116,7 @@
{
result.append(line);
}
- log.info("recv - {}", result);
+// log.info("recv - {}", result);
}
catch (ConnectException e)
{
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/LegacySystemSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/LegacySystemSyncTask.java
index 811a110..ba6caaf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/LegacySystemSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/LegacySystemSyncTask.java
@@ -63,10 +63,10 @@
* cron琛ㄨ揪寮�: 0 0/10 * * * ? (姣�10鍒嗛挓鎵ц涓�娆�)
*/
public void syncPendingTasks() {
- log.info("寮�濮嬫墽琛屾棫绯荤粺浠诲姟鍚屾瀹氭椂浠诲姟");
+// log.info("寮�濮嬫墽琛屾棫绯荤粺浠诲姟鍚屾瀹氭椂浠诲姟");
try {
int successCount = legacySystemSyncService.batchSyncPendingTasks();
- log.info("鏃х郴缁熶换鍔″悓姝ュ畬鎴愶紝鎴愬姛鍚屾: {} 涓换鍔�", successCount);
+// log.info("鏃х郴缁熶换鍔″悓姝ュ畬鎴愶紝鎴愬姛鍚屾: {} 涓换鍔�", successCount);
} catch (Exception e) {
log.error("鏃х郴缁熶换鍔″悓姝ュ紓甯�", e);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
index d280de3..d343005 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/TaskMessageListener.java
@@ -65,6 +65,9 @@
@Autowired
private ISysTaskAssigneeService taskAssigneeService;
+ @Autowired
+ private ITaskStatusPushService taskStatusPushService;
+
@Async
@EventListener
public void handleTaskDispatchEvent(TaskDispatchSyncEvent event) {
@@ -436,7 +439,8 @@
private void sendTaskStatusToLegacy(Long taskId) {
try{
- taskStatusSyncService.syncTaskStatusFromLegacy(taskId);
+ log.info("浠诲姟鐘舵�佸悓姝ュ埌鏃х郴缁熷紑濮� taskId:{}",taskId);
+ taskStatusPushService.pushTaskStatusToLegacy(taskId);
}catch (Exception e){
log.error("浠诲姟鐘舵�佸悓姝ュ埌鏃х郴缁熷紓甯� taskId:{}",taskId, e);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDispatchOrdService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDispatchOrdService.java
index 5af35f3..7c37db6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDispatchOrdService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDispatchOrdService.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.service;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.system.domain.DictionaryCondition;
import com.ruoyi.system.domain.DispatchOrd;
@@ -10,6 +12,7 @@
*
* @author ruoyi
*/
+@DataSource(DataSourceType.SQLSERVER)
public interface IDispatchOrdService {
/**
* 鏍规嵁鏈嶅姟璁㈠崟ID鏌ヨ璋冨害璁㈠崟
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITaskStatusPushService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITaskStatusPushService.java
index a81c876..7dae329 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITaskStatusPushService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITaskStatusPushService.java
@@ -1,5 +1,8 @@
package com.ruoyi.system.service;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+
/**
* 浠诲姟鐘舵�佹帹閫丼ervice鎺ュ彛
* 璐熻矗灏嗘柊绯荤粺鐨勪换鍔＄姸鎬佹帹閫佸埌鏃х郴缁�
@@ -7,6 +10,7 @@
* @author ruoyi
* @date 2024-01-16
*/
+
public interface ITaskStatusPushService {
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacySystemSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacySystemSyncServiceImpl.java
index f78b7ff..f8a37d7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacySystemSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacySystemSyncServiceImpl.java
@@ -96,7 +96,7 @@
@Override
public int batchSyncPendingTasks() {
if (!legacyConfig.isEnabled()) {
- log.info("鏃х郴缁熷悓姝ュ凡绂佺敤");
+// log.info("鏃х郴缁熷悓姝ュ凡绂佺敤");
return 0;
}
@@ -110,7 +110,7 @@
List<SysTaskEmergency> pendingTasks = sysTaskEmergencyService.selectPendingSyncTasks(offset, pageSize);
if (pendingTasks == null || pendingTasks.isEmpty()) {
- log.info("娌℃湁鏇村闇�瑕佸悓姝ョ殑浠诲姟锛宱ffset: {}", offset);
+// log.info("娌℃湁鏇村闇�瑕佸悓姝ョ殑浠诲姟锛宱ffset: {}", offset);
break; // 娌℃湁鏇村鏁版嵁锛岄��鍑哄惊鐜�
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacyTransferSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacyTransferSyncServiceImpl.java
index 42962b5..58e1a02 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacyTransferSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LegacyTransferSyncServiceImpl.java
@@ -619,7 +619,7 @@
List<Long> vehicleIds = new ArrayList<>();
vehicleIds.add(vehicleInfo.getVehicleId());
createTaskVo.setVehicleIds(vehicleIds);
- log.debug("杞繍浠诲姟,ServiceOrdID:{} 閫氳繃杞︾墝鍙锋壘鍒拌溅杈嗕俊鎭�: vehicle_id={}, vehicle_no={}",serviceOrdID, vehicleInfo.getVehicleId(), vehicleInfo.getVehicleNo());
+// log.debug("杞繍浠诲姟,ServiceOrdID:{} 閫氳繃杞︾墝鍙锋壘鍒拌溅杈嗕俊鎭�: vehicle_id={}, vehicle_no={}",serviceOrdID, vehicleInfo.getVehicleId(), vehicleInfo.getVehicleNo());
} else {
log.warn("杞繍浠诲姟,ServiceOrdID:{} 鏈壘鍒板搴旂殑杞﹁締淇℃伅: car_id={}, vehicle_no={}",serviceOrdID, carID, carLicense);
}
@@ -632,7 +632,7 @@
List<Long> vehicleIds = new ArrayList<>();
vehicleIds.add(vehicleInfo.getVehicleId());
createTaskVo.setVehicleIds(vehicleIds);
- log.debug("閫氳繃杞︾墝鍙锋壘鍒拌溅杈嗕俊鎭�: vehicle_id={}, vehicle_no={}", vehicleInfo.getVehicleId(), vehicleInfo.getVehicleNo());
+// log.debug("閫氳繃杞︾墝鍙锋壘鍒拌溅杈嗕俊鎭�: vehicle_id={}, vehicle_no={}", vehicleInfo.getVehicleId(), vehicleInfo.getVehicleNo());
} else {
log.warn("鏈壘鍒板搴旂殑杞﹁締淇℃伅: vehicle_no={}", carLicense);
}
@@ -829,7 +829,7 @@
return String.join(",", diseaseIds);
}
- log.info("鏌ヨ鍒扮梾鎯呬俊鎭紝鏈嶅姟鍗旾D: {}, 鐥呮儏鏁伴噺: {}", serviceOrdID, diseaseIds != null ? diseaseIds.size() : 0);
+// log.info("鏌ヨ鍒扮梾鎯呬俊鎭紝鏈嶅姟鍗旾D: {}, 鐥呮儏鏁伴噺: {}", serviceOrdID, diseaseIds != null ? diseaseIds.size() : 0);
return null;
} catch (Exception e) {
log.error("鏌ヨ鐥呮儏淇℃伅寮傚父锛屾湇鍔″崟ID: {}", serviceOrdID, e);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
index 6b50a98..a2dbe88 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
@@ -327,7 +327,7 @@
return;
}
- log.info("鏇存柊杞繍浠诲姟 taskId:{}", existingInfo.getTaskId());
+// log.info("鏇存柊杞繍浠诲姟 taskId:{}", existingInfo.getTaskId());
// 鏇存柊鎮ｈ�呬俊鎭�
if (createVO.getPatient() != null) {
@@ -383,7 +383,7 @@
if (coords != null) {
existingInfo.setHospitalOutLongitude(BigDecimal.valueOf(coords.get("lng")));
existingInfo.setHospitalOutLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+// log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
}
} catch (Exception e) {
log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
@@ -424,7 +424,7 @@
if (coords != null) {
existingInfo.setHospitalInLongitude(BigDecimal.valueOf(coords.get("lng")));
existingInfo.setHospitalInLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+// log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
}
} catch (Exception e) {
log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
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 8f437dd..461aae1 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
@@ -101,6 +101,10 @@
@Autowired
private ISysTaskVehicleService sysTaskVehicleService;
+ @Autowired
+ private ISysTaskAssigneeService assigneeService;
+
+
@Override
public Boolean dispatchSyncEvent(Long taskId) {
SysTask task= sysTaskMapper.selectSysTaskByTaskId(taskId);
@@ -124,7 +128,7 @@
public SysTask selectSysTaskByTaskId(Long taskId) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task != null) {
-
+ bindTaskAssign(task);
// 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
@@ -139,6 +143,13 @@
return task;
}
+
+ private void bindTaskAssign(SysTask task){
+ List<SysTaskAssignee> assignees= assigneeService.getAssigneesByTaskId(task.getTaskId());
+ if(assignees!=null && !assignees.isEmpty()) {
+ task.setAssignees(assignees);
+ }
+ }
/**
* 鏌ヨ浠诲姟绠＄悊鍒楄〃
*
@@ -149,7 +160,7 @@
public List<SysTask> selectSysTaskList(TaskQueryVO queryVO) {
List<SysTask> tasks= sysTaskMapper.selectSysTaskList(queryVO);
tasks.forEach(task -> {
-
+ bindTaskAssign( task);
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
task.setEmergencyInfo(emergencyInfo);
@@ -220,6 +231,7 @@
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();
@@ -344,7 +356,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int 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){
@@ -446,10 +457,10 @@
private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
List<Long> assigneeIds = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserId())
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
.collect(Collectors.toList());
List<String> assigneeNames = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserName())
+ .map(TaskCreateVO.AssigneeInfo::getUserName)
.collect(Collectors.toList());
eventPublisher.publishEvent(new TaskAssignedEvent(
@@ -712,13 +723,6 @@
task.setTaskCode(updateVO.getTaskCode());
}
-
-
-
-// task.setDepartureLongitude(updateVO.getDepartureLongitude());
-// task.setDepartureLatitude(updateVO.getDepartureLatitude());
-// task.setDestinationLongitude(updateVO.getDestinationLongitude());
-// task.setDestinationLatitude(updateVO.getDestinationLatitude());
Boolean modifyOutLongLat = false;
// 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
if (task != null && updateVO.getDepartureAddress() != null
@@ -1190,7 +1194,7 @@
public List<SysTask> selectMyTasks(Long userId) {
List<SysTask> list = sysTaskMapper.selectMyTasks(userId);
list.stream().forEach(task -> {
-
+ bindTaskAssign(task);
if(task.getTaskType().equals("EMERGENCY_TRANSFER")){
task.setEmergencyInfo(sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId()));
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
index 93a4c36..98a4b8f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
@@ -48,7 +48,6 @@
* @return 鏄惁鎺ㄩ�佹垚鍔�
*/
@Override
- @Transactional
public boolean pushTaskStatusToLegacy(Long taskId) {
if (!legacyConfig.isEnabled()) {
// log.info("鏃х郴缁熷悓姝ュ凡绂佺敤锛岃烦杩囩姸鎬佹帹閫侊紝浠诲姟ID: {}", taskId);
@@ -93,8 +92,8 @@
// 杞崲涓烘棫绯荤粺鐘舵�佺爜
Integer targetStatusCode = TaskStatusPushConverter.convertToLegacyStatus(newTaskStatus);
if (targetStatusCode == null) {
-// log.debug("銆愭柊鎺ㄦ棫銆戜换鍔＄姸鎬佷笉闇�瑕佹帹閫佸埌鏃х郴缁燂紝浠诲姟ID: {}, 鐘舵��: {}",
-// taskId, newTaskStatus.getInfo());
+ log.debug("銆愭柊鎺ㄦ棫銆戜换鍔＄姸鎬佷笉闇�瑕佹帹閫佸埌鏃х郴缁燂紝浠诲姟ID: {}, 鐘舵��: {}",
+ taskId, newTaskStatus.getInfo());
return false;
}
@@ -120,12 +119,12 @@
// 鎺ㄩ�佺姸鎬佸埌鏃х郴缁�
boolean result = updateLegacyTaskStatus(emergency.getLegacyDispatchOrdId(), targetStatusCode);
- if (!result) {
-// log.info("銆愭柊鎺ㄦ棫銆戜换鍔＄姸鎬佹帹閫佹垚鍔燂紝浠诲姟ID: {}, DispatchOrdID: {}, 鏃х姸鎬�: {} ({}), 鏂扮姸鎬�: {} ({})",
-// taskId, emergency.getLegacyDispatchOrdId(),
-// currentLegacyStatus, TaskStatusPushConverter.getLegacyStatusDescription(currentLegacyStatus),
-// targetStatusCode, TaskStatusPushConverter.getLegacyStatusDescription(targetStatusCode));
-// } else {
+ if (result) {
+ log.info("銆愭柊鎺ㄦ棫銆戜换鍔＄姸鎬佹帹閫佹垚鍔燂紝浠诲姟ID: {}, DispatchOrdID: {}, 鏃х姸鎬�: {} ({}), 鏂扮姸鎬�: {} ({})",
+ taskId, emergency.getLegacyDispatchOrdId(),
+ currentLegacyStatus, TaskStatusPushConverter.getLegacyStatusDescription(currentLegacyStatus),
+ targetStatusCode, TaskStatusPushConverter.getLegacyStatusDescription(targetStatusCode));
+ } else {
log.error("銆愭柊鎺ㄦ棫銆戜换鍔＄姸鎬佹帹閫佸け璐ワ紝浠诲姟ID: {}, DispatchOrdID: {}",
taskId, emergency.getLegacyDispatchOrdId());
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
index d717e76..7c6ab7a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
@@ -49,7 +49,6 @@
* @return 鏄惁鍚屾鎴愬姛
*/
@Override
- @Transactional
public boolean syncTaskStatusFromLegacy(Long taskId) {
if (!legacyConfig.isEnabled()) {
log.info("鏃х郴缁熷悓姝ュ凡绂佺敤锛岃烦杩囩姸鎬佸悓姝ワ紝浠诲姟ID: {}", taskId);
@@ -219,7 +218,6 @@
* @param legacyStatus 鏃х郴缁熺姸鎬佺爜
* @return 鏄惁鎴愬姛
*/
- @Transactional
private boolean syncTaskStatusWithLegacyState(Long taskId, Integer legacyStatus) {
try {
// 鏌ヨ浠诲姟淇℃伅
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
index 8c18cea..8fcf410 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
@@ -229,7 +229,7 @@
params.put("ServiceOrdDepartureType", "1"); // 棰勭害绫诲瀷
params.put("ConditionLevel", "0"); // 鐥呴噸绾у埆
params.put("DirectionType", "0"); // 杞繍鍘诲悜
- params.put("ServiceOrd_m", "1"); // 鏉ユ簮鍏ュ彛
+ params.put("ServiceOrd_m", ""); // 鏉ユ簮鍏ュ彛
params.put("FromHQ2_is", "0"); // 骞垮窞鎬婚儴鎺ㄩ�佷换鍔℃爣璁�
params.put("OrderPrice_Auto", "0"); // 璁㈠崟鑷姩鎶ヤ环鍙傝�冨��
--
Gitblit v1.9.1