From 5d75fcaea0a3774052b7484a4ffe755258502363 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 20:49:11 +0800
Subject: [PATCH] fix:开始执行人员就绪按钮
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 1002 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 956 insertions(+), 46 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 7e28b71..a6bca50 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
@@ -2,15 +2,13 @@
import java.io.*;
import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
import java.util.stream.Collectors;
import java.net.HttpURLConnection;
import java.net.URL;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.utils.TaskCodeGenerator;
import com.ruoyi.common.config.ImageUrlConfig;
@@ -31,15 +29,14 @@
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.domain.SysTaskWelfare;
import com.ruoyi.system.domain.SysTaskAssignee;
-import com.ruoyi.system.domain.vo.TaskQueryVO;
-import com.ruoyi.system.domain.vo.TaskCreateVO;
-import com.ruoyi.system.domain.vo.TaskUpdateVO;
-import com.ruoyi.system.domain.vo.TaskStatisticsVO;
import com.ruoyi.system.domain.enums.TaskStatus;
import com.ruoyi.system.domain.VehicleInfo;
import com.ruoyi.system.service.ISysTaskService;
import com.ruoyi.system.service.ILegacySystemSyncService;
+import com.ruoyi.system.service.ISysTaskEmergencyService;
import com.ruoyi.system.service.ITaskAttachmentSyncService;
+import com.ruoyi.system.service.IMapService;
+import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.event.TaskCreatedEvent;
import com.ruoyi.system.event.TaskAssignedEvent;
import com.ruoyi.system.event.TaskStatusChangedEvent;
@@ -87,6 +84,9 @@
private ILegacySystemSyncService legacySystemSyncService;
@Autowired
+ private ISysTaskEmergencyService sysTaskEmergencyService;
+
+ @Autowired
private ApplicationEventPublisher eventPublisher;
@Autowired
@@ -97,6 +97,12 @@
@Autowired
private SysUserMapper sysUserMapper;
+
+ @Autowired(required = false)
+ private IMapService mapService;
+
+ @Autowired
+ private ISysConfigService configService;
/**
* 鏌ヨ浠诲姟绠＄悊
@@ -207,6 +213,44 @@
task.setEstimatedDistance(createVO.getDistance());
}
+ // 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滅己澶憋級
+ if (task.getDepartureAddress() != null &&
+ (task.getDepartureLongitude() == null || task.getDepartureLatitude() == null) &&
+ mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ task.getDepartureAddress(),
+ extractCityFromAddress(task.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滅己澶憋級
+ if (task.getDestinationAddress() != null &&
+ (task.getDestinationLongitude() == null || task.getDestinationLatitude() == null) &&
+ mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ task.getDestinationAddress(),
+ extractCityFromAddress(task.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
int result = sysTaskMapper.insertSysTask(task);
// 淇濆瓨杞﹁締鍏宠仈淇℃伅
@@ -216,11 +260,11 @@
taskVehicle.setTaskId(task.getTaskId());
taskVehicle.setVehicleId(vehicleId);
taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setAssignBy(username);
taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setCreateBy(SecurityUtils.getUsername());
+ taskVehicle.setCreateBy(username);
taskVehicle.setCreateTime(DateUtils.getNowDate());
- taskVehicle.setUpdateBy(SecurityUtils.getUsername());
+ taskVehicle.setUpdateBy(username);
taskVehicle.setUpdateTime(DateUtils.getNowDate());
sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
@@ -234,7 +278,7 @@
// 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
- saveEmergencyInfo(task.getTaskId(),username, createVO,null,null);
+ saveEmergencyInfo(task.getTaskId(),username, createVO,null,null,null);
}
// 淇濆瓨绂忕杞︽墿灞曚俊鎭�
@@ -308,7 +352,7 @@
*/
@Override
@Transactional
- public int insertTask(TaskCreateVO createVO,String serviceOrderId,String dispatchOrderId, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
+ public int insertTask(TaskCreateVO createVO,String serviceOrderId,String 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());
@@ -382,6 +426,44 @@
task.setEstimatedDistance(createVO.getDistance());
}
+ // 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滅己澶憋級
+ if (task.getDepartureAddress() != null &&
+ (task.getDepartureLongitude() == null || task.getDepartureLatitude() == null) &&
+ mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ task.getDepartureAddress(),
+ extractCityFromAddress(task.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滅己澶憋級
+ if (task.getDestinationAddress() != null &&
+ (task.getDestinationLongitude() == null || task.getDestinationLatitude() == null) &&
+ mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ task.getDestinationAddress(),
+ extractCityFromAddress(task.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
int result = sysTaskMapper.insertSysTask(task);
// 淇濆瓨杞﹁締鍏宠仈淇℃伅
@@ -397,7 +479,7 @@
taskVehicle.setCreateTime(createTime);
taskVehicle.setUpdateBy(userName);
taskVehicle.setUpdateTime(updateTime);
-
+
sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
}
}
@@ -409,7 +491,7 @@
// 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
- saveEmergencyInfo(task.getTaskId(),userName, createVO, serviceOrderId, dispatchOrderId);
+ saveEmergencyInfo(task.getTaskId(),userName, createVO, serviceOrderId, dispatchOrderId, serviceOrdNo);
}
// 淇濆瓨绂忕杞︽墿灞曚俊鎭�
@@ -468,38 +550,401 @@
*/
@Override
@Transactional
- public int updateSysTask(TaskUpdateVO updateVO) {
+ public int updateSysTask(TaskUpdateVO updateVO, Boolean updateFromLegacy) {
SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(updateVO.getTaskId());
if (oldTask == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
}
+ String userName = SecurityUtils.getUsername();
SysTask task = new SysTask();
task.setTaskId(updateVO.getTaskId());
task.setTaskDescription(updateVO.getTaskDescription());
+ task.setPlannedStartTime(updateVO.getPlannedStartTime());
+ task.setPlannedEndTime(updateVO.getPlannedEndTime());
+ task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(userName);
+ task.setUpdateTime(updateVO.getUpdateTime() != null ? updateVO.getUpdateTime() : DateUtils.getNowDate());
+ task.setRemark(updateVO.getRemark());
+
+ // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
task.setDepartureAddress(updateVO.getDepartureAddress());
task.setDestinationAddress(updateVO.getDestinationAddress());
task.setDepartureLongitude(updateVO.getDepartureLongitude());
task.setDepartureLatitude(updateVO.getDepartureLatitude());
task.setDestinationLongitude(updateVO.getDestinationLongitude());
task.setDestinationLatitude(updateVO.getDestinationLatitude());
- task.setPlannedStartTime(updateVO.getPlannedStartTime());
- task.setPlannedEndTime(updateVO.getPlannedEndTime());
- task.setAssigneeId(updateVO.getAssigneeId());
- task.setUpdateBy(SecurityUtils.getUsername());
- task.setUpdateTime(DateUtils.getNowDate());
- task.setRemark(updateVO.getRemark());
- // 閲嶆柊璁＄畻棰勮鍏噷鏁�
- calculateEstimatedDistance(task);
+ // 璁剧疆棰勮璺濈
+ if (updateVO.getEstimatedDistance() != null) {
+ task.setEstimatedDistance(updateVO.getEstimatedDistance());
+ } else if (updateVO.getTransferDistance() != null) {
+ // 鍏煎鎬ユ晳杞繍瀛楁
+ task.setEstimatedDistance(updateVO.getTransferDistance());
+ } else if (updateVO.getDistance() != null) {
+ // 鍏煎绂忕杞﹀瓧娈�
+ task.setEstimatedDistance(updateVO.getDistance());
+ }
+ // 濡傛灉鏇存柊浜嗛儴闂↖D
+ if (updateVO.getDeptId() != null) {
+ task.setDeptId(updateVO.getDeptId());
+ }
+
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ task.setTaskCode(updateVO.getTaskCode());
+ }
+
+ // 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滄洿鏂颁簡鍦板潃浣嗙己澶卞潗鏍囷級
+ if (updateVO.getDepartureAddress() != null &&
+ (updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null) &&
+ mapService != null) {
+ if (!updateVO.getDepartureAddress().equals(oldTask.getDepartureAddress())) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDepartureAddress(),
+ extractCityFromAddress(updateVO.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+ }
+
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滄洿鏂颁簡鍦板潃浣嗙己澶卞潗鏍囷級
+ if (updateVO.getDestinationAddress() != null &&
+ (updateVO.getDestinationLongitude() == null || updateVO.getDestinationLatitude() == null) &&
+ mapService != null) {
+ if (!updateVO.getDestinationAddress().equals(oldTask.getDestinationAddress())) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDestinationAddress(),
+ extractCityFromAddress(updateVO.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+ }
+ // 鐢ㄤ簬璺熻釜鏄惁闇�瑕侀噸鏂板悓姝ワ紙杞﹁締銆佷汉鍛樸�佸湴鍧�銆佹垚浜や环鍙樻洿锛�
+ boolean needResync = true;
int result = sysTaskMapper.updateSysTask(task);
+
+
+
+ // 鏇存柊杞﹁締鍏宠仈
+ if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
+ // 鏌ヨ鐜版湁鐨勮溅杈嗗叧鑱�
+ List<SysTaskVehicle> existingVehicles = sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(updateVO.getTaskId());
+ List<Long> existingVehicleIds = existingVehicles.stream()
+ .map(SysTaskVehicle::getVehicleId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫杞﹁締ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean vehiclesChanged = !new HashSet<>(existingVehicleIds).equals(new HashSet<>(updateVO.getVehicleIds()));
+
+ // 鍙湁杞﹁締鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (vehiclesChanged) {
+ // 鍒犻櫎鏃х殑杞﹁締鍏宠仈
+ sysTaskVehicleMapper.deleteSysTaskVehicleByTaskId(updateVO.getTaskId());
+
+ // 娣诲姞鏂扮殑杞﹁締鍏宠仈
+ Date now = DateUtils.getNowDate();
+ String currentUser = userName;
+ for (Long vehicleId : updateVO.getVehicleIds()) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(updateVO.getTaskId());
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(now);
+ taskVehicle.setAssignBy(currentUser);
+ taskVehicle.setCreateTime(now);
+ sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+ }
+
+ // 鏍囪闇�瑕侀噸鏂板悓姝ワ紙杞﹁締鍙樻洿锛�
+ needResync = true;
+ }
+ }
+
+ // 鏇存柊鎵ц浜哄憳锛堟娴嬩汉鍛樺彉鏇达級
+ if (result > 0 && updateVO.getAssignees() != null) {
+ // 鏌ヨ鐜版湁鐨勬墽琛屼汉鍛�
+ List<SysTaskAssignee> existingAssignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(updateVO.getTaskId());
+ List<Long> existingAssigneeIds = existingAssignees.stream()
+ .map(SysTaskAssignee::getUserId)
+ .collect(Collectors.toList());
+
+ List<Long> newAssigneeIds = updateVO.getAssignees().stream()
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫鎵ц浜哄憳ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean assigneesChanged = !new HashSet<>(existingAssigneeIds).equals(new HashSet<>(newAssigneeIds));
+
+ // 鍙湁鎵ц浜哄憳鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (assigneesChanged) {
+ // 鍒犻櫎鏃х殑鎵ц浜哄憳鍏宠仈
+ sysTaskAssigneeMapper.deleteSysTaskAssigneeByTaskId(updateVO.getTaskId());
+
+ // 娣诲姞鏂扮殑鎵ц浜哄憳鍏宠仈
+ if (!updateVO.getAssignees().isEmpty()) {
+ saveTaskAssignees(updateVO.getTaskId(), updateVO.getAssignees(), userName);
+ }
+
+ // 鏍囪闇�瑕侀噸鏂板悓姝ワ紙浜哄憳鍙樻洿锛�
+ needResync = true;
+ }
+ }
+
+ // 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅锛堟娴嬪湴鍧�鍜屾垚浜や环鍙樻洿锛�
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType())) {
+ // 鑾峰彇鏃х殑鎬ユ晳杞繍淇℃伅
+ SysTaskEmergency oldEmergency = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(updateVO.getTaskId());
+
+ // 妫�娴嬭浆鍑哄尰闄㈠湴鍧�鍙樻洿
+ boolean hospitalOutAddressChanged = false;
+ if (updateVO.getHospitalOut() != null && updateVO.getHospitalOut().getAddress() != null
+ && oldEmergency != null
+ && !updateVO.getHospitalOut().getAddress().equals(oldEmergency.getHospitalOutAddress())) {
+ hospitalOutAddressChanged = true;
+ }
+
+ // 妫�娴嬭浆鍏ュ尰闄㈠湴鍧�鍙樻洿
+ boolean hospitalInAddressChanged = false;
+ if (updateVO.getHospitalIn() != null && updateVO.getHospitalIn().getAddress() != null
+ && oldEmergency != null
+ && !updateVO.getHospitalIn().getAddress().equals(oldEmergency.getHospitalInAddress())) {
+ hospitalInAddressChanged = true;
+ }
+
+ // 妫�娴嬫垚浜や环鍙樻洿
+ boolean transferPriceChanged = false;
+ if (updateVO.getPrice() != null
+ && oldEmergency != null
+ && oldEmergency.getTransferPrice() != null
+ && updateVO.getPrice().compareTo(oldEmergency.getTransferPrice()) != 0) {
+ transferPriceChanged = true;
+ }
+
+ ;
+
+ // 鏇存柊鎬ユ晳杞繍淇℃伅
+ if (updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null) {
+ updateEmergencyInfoFromCreateVO(updateVO.getTaskId(), updateVO, userName);
+ }
+
+ // 濡傛灉鍦板潃鎴栨垚浜や环鍙戠敓鍙樻洿锛屾爣璁伴渶瑕侀噸鏂板悓姝�
+ if (hospitalOutAddressChanged || hospitalInAddressChanged || transferPriceChanged) {
+ needResync = true;
+ }
+ }
+
+ // 鏇存柊绂忕杞︽墿灞曚俊鎭�
+ if (result > 0 && "WELFARE".equals(oldTask.getTaskType())) {
+ if (updateVO.getPassenger() != null || updateVO.getStartAddress() != null || updateVO.getEndAddress() != null) {
+ updateWelfareInfoFromCreateVO(updateVO.getTaskId(), updateVO, userName);
+ }
+ }
+
+ // 濡傛灉鏄�ユ晳杞繍浠诲姟涓旀湁鍙樻洿锛屾爣璁伴渶瑕侀噸鏂板悓姝�
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && needResync && !updateFromLegacy) {
+ try {
+ sysTaskEmergencyService.markNeedResync(updateVO.getTaskId());
+ } catch (Exception e) {
+ // 鏍囪澶辫触涓嶅奖鍝嶄富娴佺▼
+ }
+ }
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
- recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
- buildTaskDescription(oldTask), buildTaskDescription(task),
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
+ buildTaskDescription(oldTask), buildTaskDescription(task),
+ SecurityUtils.getUserId(), userName);
+ }
+
+ return result;
+ }
+
+ /**
+ * 鏇存柊浠诲姟锛堢敤浜庢棫绯荤粺鍚屾锛�
+ *
+ * @param updateVO 浠诲姟鏇存柊瀵硅薄
+ * @param serviceOrderId 鏃х郴缁熸湇鍔″崟ID
+ * @param dispatchOrderId 鏃х郴缁熻皟搴﹀崟ID
+ * @param serviceOrdNo 鏃х郴缁熸湇鍔″崟缂栧彿
+ * @param userId 鐢ㄦ埛ID
+ * @param userName 鐢ㄦ埛鍚�
+ * @param deptId 閮ㄩ棬ID
+ * @param createTime 鍒涘缓鏃堕棿
+ * @param updateTime 鏇存柊鏃堕棿
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTask(TaskUpdateVO updateVO, String serviceOrderId, String dispatchOrderId, String serviceOrdNo,
+ Long userId, String userName, Long deptId, Date createTime, Date updateTime) {
+ // 閫氳繃鏃х郴缁熸湇鍔″崟ID鏌ユ壘浠诲姟
+ SysTaskEmergency taskEmergency = sysTaskEmergencyMapper.selectByLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+ Long taskId = taskEmergency.getTaskId();
+ updateVO.setTaskId(taskId);
+ SysTask task = new SysTask();
+ task.setTaskId(taskId);
+ task.setTaskDescription(updateVO.getTaskDescription());
+ task.setPlannedStartTime(updateVO.getPlannedStartTime());
+ task.setPlannedEndTime(updateVO.getPlannedEndTime());
+ task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(userName);
+ task.setUpdateTime(DateUtils.getNowDate());
+ task.setRemark(updateVO.getRemark());
+
+
+ // 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
+ task.setDepartureAddress(updateVO.getDepartureAddress());
+ task.setDestinationAddress(updateVO.getDestinationAddress());
+ task.setDepartureLongitude(updateVO.getDepartureLongitude());
+ task.setDepartureLatitude(updateVO.getDepartureLatitude());
+ task.setDestinationLongitude(updateVO.getDestinationLongitude());
+ task.setDestinationLatitude(updateVO.getDestinationLatitude());
+
+ // 濡傛灉鏇存柊浜嗛儴闂↖D
+ if (updateVO.getDeptId() != null) {
+ task.setDeptId(updateVO.getDeptId());
+ }
+
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ task.setTaskCode(updateVO.getTaskCode());
+ }
+
+ // 鑾峰彇鏃т换鍔′俊鎭紝鐢ㄤ簬鍒ゆ柇鍦板潃鏄惁鍙樻洿
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
+
+ // 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
+ if (oldTask != null && updateVO.getDepartureAddress() != null
+ && !updateVO.getDepartureAddress().equals(oldTask.getDepartureAddress())
+ && (updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null)
+ && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDepartureAddress(),
+ extractCityFromAddress(updateVO.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
+ if (oldTask != null && updateVO.getDestinationAddress() != null
+ && !updateVO.getDestinationAddress().equals(oldTask.getDestinationAddress())
+ && (updateVO.getDestinationLongitude() == null || updateVO.getDestinationLatitude() == null)
+ && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDestinationAddress(),
+ extractCityFromAddress(updateVO.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ int result = sysTaskMapper.updateSysTask(task);
+
+ // 鏇存柊杞﹁締鍏宠仈
+ if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
+ // 鏌ヨ鐜版湁鐨勮溅杈嗗叧鑱�
+ List<SysTaskVehicle> existingVehicles = sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId);
+ List<Long> existingVehicleIds = existingVehicles.stream()
+ .map(SysTaskVehicle::getVehicleId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫杞﹁締ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean vehiclesChanged = !new HashSet<>(existingVehicleIds).equals(new HashSet<>(updateVO.getVehicleIds()));
+
+ // 鍙湁杞﹁締鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (vehiclesChanged) {
+ // 鍒犻櫎鏃х殑杞﹁締鍏宠仈
+ sysTaskVehicleMapper.deleteSysTaskVehicleByTaskId(taskId);
+
+ // 娣诲姞鏂扮殑杞﹁締鍏宠仈
+ Date now = DateUtils.getNowDate();
+ for (Long vehicleId : updateVO.getVehicleIds()) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(taskId);
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(now);
+ taskVehicle.setAssignBy(userName);
+ taskVehicle.setCreateTime(now);
+ sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+ }
+ }
+ }
+
+ // 鏇存柊鎵ц浜哄憳锛堟娴嬩汉鍛樺彉鏇达級
+ if (result > 0 && updateVO.getAssignees() != null) {
+ // 鏌ヨ鐜版湁鐨勬墽琛屼汉鍛�
+ List<SysTaskAssignee> existingAssignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ List<Long> existingAssigneeIds = existingAssignees.stream()
+ .map(SysTaskAssignee::getUserId)
+ .collect(Collectors.toList());
+
+ List<Long> newAssigneeIds = updateVO.getAssignees().stream()
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫鎵ц浜哄憳ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean assigneesChanged = !new HashSet<>(existingAssigneeIds).equals(new HashSet<>(newAssigneeIds));
+
+ // 鍙湁鎵ц浜哄憳鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (assigneesChanged) {
+ // 鍒犻櫎鏃х殑鎵ц浜哄憳鍏宠仈
+ sysTaskAssigneeMapper.deleteSysTaskAssigneeByTaskId(taskId);
+
+ // 娣诲姞鏂扮殑鎵ц浜哄憳鍏宠仈
+ if (!updateVO.getAssignees().isEmpty()) {
+ saveTaskAssignees(taskId, updateVO.getAssignees(), userName);
+ }
+ }
+ }
+
+ // 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅
+ if (result > 0) {
+ // 鏇存柊鏃х郴缁烮D
+ if (serviceOrderId != null) {
+ taskEmergency.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+ }
+ if (dispatchOrderId != null) {
+ taskEmergency.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
+ }
+ if (serviceOrdNo != null) {
+ taskEmergency.setLegacyServiceOrdNo(serviceOrdNo);
+ }
+
+ // 浣跨敤TaskCreateVO鐨勫瓧娈垫潵鏇存柊鎬ユ晳杞繍淇℃伅
+ if (updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null) {
+ updateEmergencyInfoFromCreateVO(taskId, updateVO, userName);
+ }
}
return result;
@@ -583,7 +1028,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
}
@@ -598,7 +1042,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog) {
SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (oldTask == null) {
@@ -650,7 +1093,10 @@
.map(SysTaskAssignee::getUserId)
.collect(Collectors.toList());
}
-
+ Long userId=SecurityUtils.getUserId();
+ Double lng=locationLog==null?null: locationLog.getLongitude();
+ Double lat=locationLog==null?null: locationLog.getLatitude();
+ String address=locationLog==null?null: locationLog.getLocationAddress();
eventPublisher.publishEvent(new TaskStatusChangedEvent(
this,
oldTask.getTaskId(),
@@ -660,7 +1106,11 @@
oldTaskStatus.getInfo(),
newStatus.getInfo(),
assigneeIds,
- oldTask.getCreatorId()
+ oldTask.getCreatorId(),
+ userId,
+ lng, lat,
+ address
+
));
}
@@ -703,7 +1153,7 @@
recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
"涓婁紶鏂囦欢锛�" + file.getOriginalFilename() + "(鍒嗙被锛�" + categoryDesc + ")",
SecurityUtils.getUserId(), SecurityUtils.getUsername());
-
+
}
@@ -763,7 +1213,7 @@
recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
"閫氳繃寰俊涓婁紶鏂囦欢锛�" + fileName + "(鍒嗙被锛�" + categoryDesc + ")",
SecurityUtils.getUserId(), SecurityUtils.getUsername());
-
+
}
@@ -916,7 +1366,7 @@
*/
@Override
@Transactional
- public int assignVehicleToTask(Long taskId, Long vehicleId, String remark) {
+ public int assignVehicleToTask(Long taskId, Long vehicleId, String remark,Long userId,String userName) {
// 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
if (exists > 0) {
@@ -927,7 +1377,7 @@
taskVehicle.setTaskId(taskId);
taskVehicle.setVehicleId(vehicleId);
taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setAssignBy(userName);
taskVehicle.setStatus("ASSIGNED");
taskVehicle.setRemark(remark);
@@ -937,7 +1387,7 @@
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締ID锛�" + vehicleId + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId, userName);
}
return result;
@@ -975,10 +1425,10 @@
*/
@Override
@Transactional
- public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark) {
+ public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark,Long userId,String userName) {
List<SysTaskVehicle> taskVehicles = new ArrayList<>();
Date now = DateUtils.getNowDate();
- String assignBy = SecurityUtils.getUsername();
+ String assignBy = userName;
for (Long vehicleId : vehicleIds) {
// 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
@@ -1004,7 +1454,7 @@
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鎵归噺鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締鏁伴噺锛�" + result + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId,userName);
}
return result;
@@ -1112,6 +1562,8 @@
task.setAttachments(attachments);
// 鏌ヨ鎿嶄綔鏃ュ織
task.setOperationLogs(sysTaskLogMapper.selectSysTaskLogByTaskId(taskId));
+ // 鏌ヨ鎵ц浜哄憳鍒楄〃
+ task.setAssignees(sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId));
// 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
@@ -1212,6 +1664,30 @@
*/
private String generateTaskCode() {
return taskCodeGenerator.generateTaskCode();
+ }
+
+ /**
+ * 浠庡湴鍧�涓彁鍙栧煄甯傚悕绉帮紙鐢ㄤ簬鍦板浘鍦扮悊缂栫爜锛�
+ *
+ * @param address 鍦板潃
+ * @return 鍩庡競鍚嶇О
+ */
+ private String extractCityFromAddress(String address) {
+ if (address == null || address.trim().isEmpty()) {
+ return null;
+ }
+
+ // 甯歌鍩庡競鍚嶅垪琛�
+ String[] cities = {"骞垮窞", "娣卞湷", "涓滆帪", "浣涘北", "鐝犳捣", "鎯犲窞", "涓北", "姹熼棬", "婀涙睙", "鑲囧簡", "娓呰繙", "闊跺叧", "姊呭窞", "娌虫簮", "娼窞", "鎻槼", "姹曞ご", "姹曞熬", "浜戞诞", "闃虫睙","鍖椾含","涓婃捣","澶╂触"};
+
+
+ for (String city : cities) {
+ if (address.contains(city)) {
+ return city;
+ }
+ }
+
+ return null;
}
/**
@@ -1374,7 +1850,7 @@
* @param taskId 浠诲姟ID
* @param createVO 浠诲姟鍒涘缓瀵硅薄
*/
- private void saveEmergencyInfo(Long taskId,String createUserName, TaskCreateVO createVO,String serviceOrderId,String dispatchOrderId) {
+ private void saveEmergencyInfo(Long taskId,String createUserName, TaskCreateVO createVO,String serviceOrderId,String dispatchOrderId, String serviceOrdNo) {
SysTaskEmergency emergencyInfo = new SysTaskEmergency();
emergencyInfo.setTaskId(taskId);
@@ -1396,8 +1872,27 @@
emergencyInfo.setHospitalOutDepartmentId(createVO.getHospitalOut().getDepartmentId());
emergencyInfo.setHospitalOutBedNumber(createVO.getHospitalOut().getBedNumber());
emergencyInfo.setHospitalOutAddress(createVO.getHospitalOut().getAddress());
- emergencyInfo.setHospitalOutLongitude(createVO.getHospitalOut().getLongitude());
- emergencyInfo.setHospitalOutLatitude(createVO.getHospitalOut().getLatitude());
+
+ // GPS鍧愭爣锛氫紭鍏堜娇鐢ㄥ墠绔紶鍏ョ殑锛屽惁鍒欏悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalOut().getLongitude() != null && createVO.getHospitalOut().getLatitude() != null) {
+ emergencyInfo.setHospitalOutLongitude(createVO.getHospitalOut().getLongitude());
+ emergencyInfo.setHospitalOutLatitude(createVO.getHospitalOut().getLatitude());
+ } else if (mapService != null && createVO.getHospitalOut().getAddress() != null) {
+ // 鍚庣鑷姩鑾峰彇GPS鍧愭爣
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalOut().getAddress(),
+ extractCityFromAddress(createVO.getHospitalOut().getAddress())
+ );
+ if (coords != null) {
+ emergencyInfo.setHospitalOutLongitude(BigDecimal.valueOf(coords.get("lng")));
+ emergencyInfo.setHospitalOutLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
+ }
+ }
}
// 璁剧疆杞叆鍖婚櫌淇℃伅
@@ -1408,8 +1903,27 @@
emergencyInfo.setHospitalInDepartmentId(createVO.getHospitalIn().getDepartmentId());
emergencyInfo.setHospitalInBedNumber(createVO.getHospitalIn().getBedNumber());
emergencyInfo.setHospitalInAddress(createVO.getHospitalIn().getAddress());
- emergencyInfo.setHospitalInLongitude(createVO.getHospitalIn().getLongitude());
- emergencyInfo.setHospitalInLatitude(createVO.getHospitalIn().getLatitude());
+
+ // GPS鍧愭爣锛氫紭鍏堜娇鐢ㄥ墠绔紶鍏ョ殑锛屽惁鍒欏悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalIn().getLongitude() != null && createVO.getHospitalIn().getLatitude() != null) {
+ emergencyInfo.setHospitalInLongitude(createVO.getHospitalIn().getLongitude());
+ emergencyInfo.setHospitalInLatitude(createVO.getHospitalIn().getLatitude());
+ } else if (mapService != null && createVO.getHospitalIn().getAddress() != null) {
+ // 鍚庣鑷姩鑾峰彇GPS鍧愭爣
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalIn().getAddress(),
+ extractCityFromAddress(createVO.getHospitalIn().getAddress())
+ );
+ if (coords != null) {
+ emergencyInfo.setHospitalInLongitude(BigDecimal.valueOf(coords.get("lng")));
+ emergencyInfo.setHospitalInLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
+ }
+ }
}
// 璁剧疆璐圭敤淇℃伅
@@ -1441,8 +1955,9 @@
emergencyInfo.setDispatchSyncStatus(2);
emergencyInfo.setDispatchSyncTime(new Date());
emergencyInfo.setDispatchSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
-
- // 绯荤粺瀛楁
+ }
+ if(serviceOrdNo!=null){
+ emergencyInfo.setLegacyServiceOrdNo(serviceOrdNo);
}
// 绯荤粺瀛楁
emergencyInfo.setCreateTime(DateUtils.getNowDate());
@@ -1451,6 +1966,229 @@
emergencyInfo.setUpdateBy(createUserName);
sysTaskEmergencyMapper.insertSysTaskEmergency(emergencyInfo);
+ }
+
+ /**
+ * 浠� TaskCreateVO 鏇存柊鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓/鏇存柊瀵硅薄
+ * @param userName 鎿嶄綔浜哄悕
+ */
+ private void updateEmergencyInfoFromCreateVO(Long taskId, TaskCreateVO createVO, String userName) {
+ // 鏌ヨ鐜版湁鐨勬墿灞曚俊鎭�
+ SysTaskEmergency existingInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ if (existingInfo == null) {
+ // 濡傛灉涓嶅瓨鍦紝鍒欏垱寤烘柊鐨�
+ existingInfo = new SysTaskEmergency();
+ existingInfo.setTaskId(taskId);
+ existingInfo.setCreateTime(DateUtils.getNowDate());
+ existingInfo.setCreateBy(userName);
+ }
+
+ // 鏇存柊鎮ｈ�呬俊鎭�
+ if (createVO.getPatient() != null) {
+ if (createVO.getPatient().getContact() != null) {
+ existingInfo.setPatientContact(createVO.getPatient().getContact());
+ }
+ if (createVO.getPatient().getPhone() != null) {
+ existingInfo.setPatientPhone(createVO.getPatient().getPhone());
+ }
+ if (createVO.getPatient().getName() != null) {
+ existingInfo.setPatientName(createVO.getPatient().getName());
+ }
+ if (createVO.getPatient().getGender() != null) {
+ existingInfo.setPatientGender(createVO.getPatient().getGender());
+ }
+ if (createVO.getPatient().getIdCard() != null) {
+ existingInfo.setPatientIdCard(createVO.getPatient().getIdCard());
+ }
+ if (createVO.getPatient().getCondition() != null) {
+ existingInfo.setPatientCondition(createVO.getPatient().getCondition());
+ }
+ }
+
+ // 鏇存柊杞嚭鍖婚櫌淇℃伅
+ if (createVO.getHospitalOut() != null) {
+ if (createVO.getHospitalOut().getId() != null) {
+ existingInfo.setHospitalOutId(createVO.getHospitalOut().getId());
+ }
+ if (createVO.getHospitalOut().getName() != null) {
+ existingInfo.setHospitalOutName(createVO.getHospitalOut().getName());
+ }
+ if (createVO.getHospitalOut().getDepartment() != null) {
+ existingInfo.setHospitalOutDepartment(createVO.getHospitalOut().getDepartment());
+ }
+ if (createVO.getHospitalOut().getDepartmentId() != null) {
+ existingInfo.setHospitalOutDepartmentId(createVO.getHospitalOut().getDepartmentId());
+ }
+ if (createVO.getHospitalOut().getBedNumber() != null) {
+ existingInfo.setHospitalOutBedNumber(createVO.getHospitalOut().getBedNumber());
+ }
+ if (createVO.getHospitalOut().getAddress() != null && !createVO.getHospitalOut().getAddress().equals(existingInfo.getHospitalOutAddress())) {
+ existingInfo.setHospitalOutAddress(createVO.getHospitalOut().getAddress());
+
+ // 濡傛灍鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalOut().getLongitude() == null && createVO.getHospitalOut().getLatitude() == null && mapService != null) {
+ try {
+
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalOut().getAddress(),
+ extractCityFromAddress(createVO.getHospitalOut().getAddress())
+ );
+ 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"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
+ }
+ }
+ }
+
+ }
+
+ // 鏇存柊杞叆鍖婚櫌淇℃伅
+ if (createVO.getHospitalIn() != null) {
+ if (createVO.getHospitalIn().getId() != null) {
+ existingInfo.setHospitalInId(createVO.getHospitalIn().getId());
+ }
+ if (createVO.getHospitalIn().getName() != null) {
+ existingInfo.setHospitalInName(createVO.getHospitalIn().getName());
+ }
+ if (createVO.getHospitalIn().getDepartment() != null) {
+ existingInfo.setHospitalInDepartment(createVO.getHospitalIn().getDepartment());
+ }
+ if (createVO.getHospitalIn().getDepartmentId() != null) {
+ existingInfo.setHospitalInDepartmentId(createVO.getHospitalIn().getDepartmentId());
+ }
+ if (createVO.getHospitalIn().getBedNumber() != null) {
+ existingInfo.setHospitalInBedNumber(createVO.getHospitalIn().getBedNumber());
+ }
+ if (createVO.getHospitalIn().getAddress() != null && !createVO.getHospitalIn().getAddress().equals(existingInfo.getHospitalInAddress())) {
+ existingInfo.setHospitalInAddress(createVO.getHospitalIn().getAddress());
+
+ // 濡傛灉鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalIn().getLongitude() == null && createVO.getHospitalIn().getLatitude() == null && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalIn().getAddress(),
+ extractCityFromAddress(createVO.getHospitalIn().getAddress())
+ );
+ 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"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
+ }
+ }
+ }
+
+ }
+
+ // 鏇存柊璐圭敤淇℃伅
+ if (createVO.getTransferDistance() != null) {
+ existingInfo.setTransferDistance(createVO.getTransferDistance());
+ }
+ if (createVO.getPrice() != null) {
+ existingInfo.setTransferPrice(createVO.getPrice());
+ }
+
+ // 鏇存柊鍗曟嵁绫诲瀷ID
+ if (createVO.getDocumentTypeId() != null) {
+ existingInfo.setDocumentTypeId(createVO.getDocumentTypeId());
+ }
+
+ // 鏇存柊浠诲姟绫诲瀷ID
+ if (createVO.getTaskTypeId() != null) {
+ existingInfo.setTaskTypeId(createVO.getTaskTypeId());
+ }
+
+ // 鏇存柊鐥呮儏ID鍒楄〃
+ if (createVO.getDiseaseIds() != null && !createVO.getDiseaseIds().isEmpty()) {
+ String diseaseIdsStr = createVO.getDiseaseIds().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ existingInfo.setDiseaseIds(diseaseIdsStr);
+ }
+
+ // 绯荤粺瀛楁
+ existingInfo.setUpdateTime(DateUtils.getNowDate());
+ existingInfo.setUpdateBy(userName);
+
+ // 鎵ц鏇存柊
+ sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
+ }
+
+ /**
+ * 浠� TaskCreateVO 鏇存柊绂忕杞︿换鍔℃墿灞曚俊鎭�
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓/鏇存柊瀵硅薄
+ * @param userName 鎿嶄綔浜哄悕
+ */
+ private void updateWelfareInfoFromCreateVO(Long taskId, TaskCreateVO createVO, String userName) {
+ // 鏌ヨ鐜版湁鐨勬墿灞曚俊鎭�
+ SysTaskWelfare existingInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ if (existingInfo == null) {
+ // 濡傛灉涓嶅瓨鍦紝鍒欏垱寤烘柊鐨�
+ existingInfo = new SysTaskWelfare();
+ existingInfo.setTaskId(taskId);
+ existingInfo.setCreateTime(DateUtils.getNowDate());
+ existingInfo.setCreateBy(userName);
+ }
+
+ // 鏇存柊涔樺淇℃伅
+ if (createVO.getPassenger() != null) {
+ if (createVO.getPassenger().getContact() != null) {
+ existingInfo.setPassengerContact(createVO.getPassenger().getContact());
+ }
+ if (createVO.getPassenger().getPhone() != null) {
+ existingInfo.setPassengerPhone(createVO.getPassenger().getPhone());
+ }
+ }
+
+ // 鏇存柊鍦板潃淇℃伅
+ if (createVO.getStartAddress() != null) {
+ existingInfo.setPickupAddress(createVO.getStartAddress());
+ }
+ if (createVO.getEndAddress() != null) {
+ existingInfo.setDestinationAddress(createVO.getEndAddress());
+ }
+
+ // 鏇存柊GPS鍧愭爣
+ if (createVO.getDepartureLongitude() != null) {
+ existingInfo.setPickupLongitude(createVO.getDepartureLongitude());
+ }
+ if (createVO.getDepartureLatitude() != null) {
+ existingInfo.setPickupLatitude(createVO.getDepartureLatitude());
+ }
+ if (createVO.getDestinationLongitude() != null) {
+ existingInfo.setDestinationLongitude(createVO.getDestinationLongitude());
+ }
+ if (createVO.getDestinationLatitude() != null) {
+ existingInfo.setDestinationLatitude(createVO.getDestinationLatitude());
+ }
+
+ // 鏇存柊璺濈鍜岃垂鐢�
+ if (createVO.getDistance() != null) {
+ existingInfo.setServiceDistance(createVO.getDistance());
+ } else if (createVO.getEstimatedDistance() != null) {
+ existingInfo.setServiceDistance(createVO.getEstimatedDistance());
+ }
+ if (createVO.getPrice() != null) {
+ existingInfo.setServicePrice(createVO.getPrice());
+ }
+
+ // 绯荤粺瀛楁
+ existingInfo.setUpdateTime(DateUtils.getNowDate());
+ existingInfo.setUpdateBy(userName);
+
+ // 鎵ц鏇存柊
+ sysTaskWelfareMapper.updateSysTaskWelfare(existingInfo);
}
/**
@@ -1533,5 +2271,177 @@
}
}
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙�
+ * 妫�鏌ワ細
+ * 1. 杞﹁締鏄惁鏈夋湭瀹屾垚鐨勪换鍔�
+ * 2. 鎵ц浜哄憳鏄惁鏈夋湭瀹屾垚鐨勪换鍔�
+ *
+ * @param taskId 浠诲姟ID
+ * @return AjaxResult 鏍￠獙缁撴灉
+ */
+ @Override
+ public com.ruoyi.common.core.domain.AjaxResult checkTaskCanDepart(Long taskId) {
+ // 鑾峰彇浠诲姟璇︽儏
+ SysTask task = this.getTaskDetail(taskId);
+ if (task == null) {
+ return com.ruoyi.common.core.domain.AjaxResult.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<Map<String, Object>> conflicts = new ArrayList<>();
+
+ // 1. 妫�鏌ヨ溅杈嗘槸鍚︽湁鏈畬鎴愮殑浠诲姟
+ List<SysTaskVehicle> taskVehicles = task.getAssignedVehicles();
+ if (taskVehicles != null && !taskVehicles.isEmpty()) {
+ for (SysTaskVehicle taskVehicle : taskVehicles) {
+ Long vehicleId = taskVehicle.getVehicleId();
+ List<SysTask> vehicleActiveTasks = this.checkVehicleActiveTasks(vehicleId);
+
+ // 杩囨护鎺夊綋鍓嶄换鍔℃湰韬�
+ vehicleActiveTasks = vehicleActiveTasks.stream()
+ .filter(t -> !t.getTaskId().equals(taskId))
+ .collect(Collectors.toList());
+
+ if (!vehicleActiveTasks.isEmpty()) {
+ for (SysTask activeTask : vehicleActiveTasks) {
+ Map<String, Object> conflict = new HashMap<>();
+ conflict.put("type", "vehicle");
+ conflict.put("vehicleNo", taskVehicle.getVehicleNo());
+ conflict.put("taskId", activeTask.getTaskId());
+ conflict.put("taskCode", activeTask.getTaskCode());
+ conflict.put("taskStatus", activeTask.getTaskStatus());
+ conflict.put("message", String.format("杞﹁締 %s 灏氭湁鏈畬鎴愮殑浠诲姟 %s锛岃鍏堝畬鎴�",
+ taskVehicle.getVehicleNo(), activeTask.getTaskCode()));
+ conflicts.add(conflict);
+ }
+ }
+ }
+ }
+
+ // 2. 妫�鏌ユ墽琛屼汉鍛樻槸鍚︽湁鏈畬鎴愮殑浠诲姟
+ List<SysTaskAssignee> assignees = task.getAssignees();
+ if (assignees != null && !assignees.isEmpty()) {
+ for (SysTaskAssignee assignee : assignees) {
+ Long userId = assignee.getUserId();
+
+ // 鏌ヨ璇ユ墽琛屼汉鐨勬墍鏈夋鍦ㄨ繘琛屼腑鐨勪换鍔★紙鎺掗櫎PENDING銆丆OMPLETED銆丆ANCELLED锛�
+ List<SysTask> userActiveTasks = this.selectMyTasks(userId).stream()
+ .filter(t -> !TaskStatus.PENDING.getCode().equals(t.getTaskStatus())
+ && !TaskStatus.COMPLETED.getCode().equals(t.getTaskStatus())
+ && !TaskStatus.CANCELLED.getCode().equals(t.getTaskStatus())
+ && !t.getTaskId().equals(taskId)) // 杩囨护鎺夊綋鍓嶄换鍔�
+ .collect(Collectors.toList());
+
+ if (!userActiveTasks.isEmpty()) {
+ for (SysTask activeTask : userActiveTasks) {
+ Map<String, Object> conflict = new HashMap<>();
+ conflict.put("type", "assignee");
+ conflict.put("userName", assignee.getUserName());
+ conflict.put("taskId", activeTask.getTaskId());
+ conflict.put("taskCode", activeTask.getTaskCode());
+ conflict.put("taskStatus", activeTask.getTaskStatus());
+ conflict.put("message", String.format("鎵ц浜� %s 灏氭湁姝ｅ湪杩涜涓殑浠诲姟 %s锛岃鍏堝畬鎴�",
+ assignee.getUserName(), activeTask.getTaskCode()));
+ conflicts.add(conflict);
+ }
+ }
+ }
+ }
+
+ // 3. 妫�鏌ユ墽琛屼汉鏄惁鍏ㄩ儴灏辩华锛堝彈閰嶇疆寮�鍏虫帶鍒讹級
+ String readyCheckEnabled = configService.selectConfigByKey("task.assignee.ready.check.enabled");
+ if ("true".equalsIgnoreCase(readyCheckEnabled)) {
+ assignees = task.getAssignees();
+ if (assignees != null && !assignees.isEmpty()) {
+ boolean allReady = assignees.stream()
+ .allMatch(a -> "1".equals(a.getIsReady()));
+ if (!allReady) {
+ Map<String, Object> conflict = new HashMap<>();
+ conflict.put("type", "assigneeReady");
+ conflict.put("message", "瀛樺湪鏈氨缁殑鎵ц浜猴紝璇风瓑寰呮墍鏈夋墽琛屼汉鐐瑰嚮灏辩华鍚庡啀鍑鸿溅");
+ conflicts.add(conflict);
+ }
+ }
+ }
+
+ // 杩斿洖缁撴灉
+ Map<String, Object> result = new HashMap<>();
+ result.put("valid", conflicts.isEmpty());
+ result.put("conflicts", conflicts);
+
+ return com.ruoyi.common.core.domain.AjaxResult.success(result);
+ }
+
+ /**
+ * 鎵ц浜虹偣鍑诲氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public com.ruoyi.common.core.domain.AjaxResult setAssigneeReady(Long taskId, Long userId) {
+ // 1. 鏌ヨ鎵ц浜哄叧鑱斾俊鎭�
+ List<SysTaskAssignee> assignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ SysTaskAssignee targetAssignee = assignees.stream()
+ .filter(a -> a.getUserId().equals(userId))
+ .findFirst()
+ .orElse(null);
+
+ if (targetAssignee == null) {
+ return com.ruoyi.common.core.domain.AjaxResult.error("鎮ㄤ笉鏄浠诲姟鐨勬墽琛屼汉");
+ }
+
+ // 2. 鏇存柊灏辩华鐘舵��
+ targetAssignee.setIsReady("1");
+ targetAssignee.setReadyTime(new Date());
+ targetAssignee.setUpdateBy(SecurityUtils.getUsername());
+ targetAssignee.setUpdateTime(new Date());
+
+ sysTaskAssigneeMapper.updateSysTaskAssignee(targetAssignee);
+
+ // 3. 妫�鏌ユ槸鍚︽墍鏈夋墽琛屼汉閮藉凡灏辩华
+ boolean allReady = assignees.stream()
+ .allMatch(a -> a.getUserId().equals(userId) || "1".equals(a.getIsReady()));
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("allReady", allReady);
+ result.put("message", "灏辩华鎴愬姛");
+
+ return com.ruoyi.common.core.domain.AjaxResult.success(result);
+ }
+
+ /**
+ * 鍙栨秷鎵ц浜哄氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public com.ruoyi.common.core.domain.AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
+ // 鏌ヨ鎵ц浜哄叧鑱斾俊鎭�
+ List<SysTaskAssignee> assignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ SysTaskAssignee targetAssignee = assignees.stream()
+ .filter(a -> a.getUserId().equals(userId))
+ .findFirst()
+ .orElse(null);
+
+ if (targetAssignee == null) {
+ return com.ruoyi.common.core.domain.AjaxResult.error("鎮ㄤ笉鏄浠诲姟鐨勬墽琛屼汉");
+ }
+
+ // 鏇存柊灏辩华鐘舵��
+ targetAssignee.setIsReady("0");
+ targetAssignee.setReadyTime(null);
+ targetAssignee.setUpdateBy(SecurityUtils.getUsername());
+ targetAssignee.setUpdateTime(new Date());
+
+ sysTaskAssigneeMapper.updateSysTaskAssignee(targetAssignee);
+
+ return com.ruoyi.common.core.domain.AjaxResult.success("宸插彇娑堝氨缁�");
+ }
}
--
Gitblit v1.9.1