From 08f95b2f159b56fa3bd4f4b348855989de8aa456 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 18 十二月 2025 21:48:18 +0800
Subject: [PATCH] feat: vehicle
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 1615 +++++++++++++++++++++++++++++------------------------------
1 files changed, 785 insertions(+), 830 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 b939e42..596f1cd 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
@@ -7,18 +7,20 @@
import java.net.HttpURLConnection;
import java.net.URL;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.event.*;
import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.utils.TaskCodeGenerator;
import com.ruoyi.common.config.ImageUrlConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.GpsDistanceUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.system.domain.SysTask;
@@ -28,18 +30,8 @@
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.ITaskAttachmentSyncService;
-import com.ruoyi.system.event.TaskCreatedEvent;
-import com.ruoyi.system.event.TaskAssignedEvent;
-import com.ruoyi.system.event.TaskStatusChangedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,9 +52,6 @@
private SysTaskMapper sysTaskMapper;
@Autowired
- private SysTaskVehicleMapper sysTaskVehicleMapper;
-
- @Autowired
private SysTaskAttachmentMapper sysTaskAttachmentMapper;
@Autowired
@@ -72,16 +61,13 @@
private SysTaskEmergencyMapper sysTaskEmergencyMapper;
@Autowired
- private SysTaskWelfareMapper sysTaskWelfareMapper;
-
- @Autowired
private SysTaskAssigneeMapper sysTaskAssigneeMapper;
- @Autowired
- private VehicleInfoMapper vehicleInfoMapper;
-
@Autowired(required = false)
private ILegacySystemSyncService legacySystemSyncService;
+
+ @Autowired
+ private ISysEmergencyTaskService sysEmergencyTaskService;
@Autowired
private ApplicationEventPublisher eventPublisher;
@@ -89,12 +75,45 @@
@Autowired
private ImageUrlConfig imageUrlConfig;
- @Autowired(required = false)
- private ITaskAttachmentSyncService taskAttachmentSyncService;
+ @Autowired
+ private ISysTaskAttachmentService sysTaskAttachmentService;
+
+
@Autowired
- private SysUserMapper sysUserMapper;
+ private ISysDeptService deptService;
+ @Autowired
+ private ISysUserService userService;
+
+ @Autowired(required = false)
+ private IMapService mapService;
+
+ @Autowired
+ private ISysConfigService configService;
+
+ @Autowired
+ private ISysTaskAssigneeService sysTaskAssigneeService;
+
+ @Autowired
+ private ISysWelfareTaskService sysWelfareTaskService;
+
+ @Autowired
+ private ISysTaskVehicleService sysTaskVehicleService;
+
+ @Override
+ public Boolean dispatchSyncEvent(Long taskId) {
+ SysTask task= sysTaskMapper.selectSysTaskByTaskId(taskId);
+ SysUser user= userService.selectUserById(task.getCreatorId());
+ Integer oaUser=user.getOaUserId();
+ SysTaskEmergency emergency = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ eventPublisher.publishEvent(new TaskDispatchSyncEvent(this, taskId, task.getTaskCode(),emergency.getLegacyServiceOrdId(), emergency.getLegacyDispatchOrdId(),oaUser));
+ return true;
+ }
+
+ private Long getBranchCompanyId(Long userId) {
+ return userService.getBranchCompanyIdByUserId(userId);
+ }
/**
* 鏌ヨ浠诲姟绠＄悊
*
@@ -105,6 +124,7 @@
public SysTask selectSysTaskByTaskId(Long taskId) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task != null) {
+
// 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
@@ -112,7 +132,7 @@
}
// 鍔犺浇绂忕杞︽墿灞曚俊鎭�
else if ("WELFARE".equals(task.getTaskType())) {
- SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ SysTaskWelfare welfareInfo = sysWelfareTaskService.getWelfareInfoByTaskId(taskId);
task.setWelfareInfo(welfareInfo);
}
}
@@ -127,7 +147,90 @@
*/
@Override
public List<SysTask> selectSysTaskList(TaskQueryVO queryVO) {
- return sysTaskMapper.selectSysTaskList(queryVO);
+ List<SysTask> tasks= sysTaskMapper.selectSysTaskList(queryVO);
+ tasks.forEach(task -> {
+
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ });
+ return tasks;
+ }
+
+ /**
+ * 璁剧疆浠诲姟鏄�婚儴鎺ㄩ�佺殑鏍囪
+ * @param taskCreatorId 浠诲姟鍒涘缓浜虹殑鐢ㄦ埛ID
+ * @param taskDeptId 浠诲姟涓殑褰掑睘鏈烘瀯ID
+ */
+ @Override
+ public Boolean isTaskHeaderPush(Long taskCreatorId,Long taskDeptId){
+ if(LongUtil.isEmpty(taskCreatorId))return false;
+ if(LongUtil.isEmpty(taskDeptId))return false ;
+ Long createrDeptId = getBranchCompanyId(taskCreatorId);
+
+ if(createrDeptId !=null && !taskDeptId.equals(createrDeptId) && createrDeptId.equals(DeptUtil.GUANGZHOU_DEPT_ID)){
+ //骞垮窞鎬婚儴鎺ㄩ�佺殑浠诲姟
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ /**
+ * 鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃
+ *
+ * @param queryVO 浠诲姟鏌ヨ瀵硅薄
+ * @param taskCode 浠诲姟缂栧彿
+ * @return 浠诲姟绠＄悊闆嗗悎
+ */
+ @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 -> {
+
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ });
+ return allTasks.stream().filter(task -> {
+ if (task.getTaskCode() != null && task.getTaskCode().contains(taskCode)) {
+ return true;
+ }
+
+ 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());
+
}
/**
@@ -140,6 +243,11 @@
@Transactional
public int insertSysTask(TaskCreateVO createVO) {
String username = SecurityUtils.getUsername();
+ Long userId = SecurityUtils.getUserId();
+ if(userId==null || userId==0){
+ log.error("insertSysTask 鐢ㄦ埛ID涓虹┖ userName:{}",username);
+ return 0;
+ }
SysTask task = new SysTask();
task.setTaskCode(generateTaskCode());
task.setTaskType(createVO.getTaskType());
@@ -148,7 +256,7 @@
task.setPlannedStartTime(createVO.getPlannedStartTime());
task.setPlannedEndTime(createVO.getPlannedEndTime());
task.setAssigneeId(createVO.getAssigneeId());
- task.setCreatorId(SecurityUtils.getUserId());
+ task.setCreatorId(userId);
// 浼樺厛浣跨敤鍓嶇浼犲叆鐨勯儴闂↖D锛屽鏋滄病鏈夊垯浣跨敤褰撳墠鐢ㄦ埛鐨勯儴闂↖D
task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId());
task.setCreateBy(username);
@@ -157,86 +265,36 @@
task.setUpdateTime(DateUtils.getNowDate());
task.setRemark(createVO.getRemark());
task.setDelFlag("0");
+
+ task.setIsHeadPush(isTaskHeaderPush(userId,task.getDeptId())?"1":"0");
- // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
- if (createVO.getDepartureAddress() != null) {
- task.setDepartureAddress(createVO.getDepartureAddress());
- }
- if (createVO.getDestinationAddress() != null) {
- task.setDestinationAddress(createVO.getDestinationAddress());
- }
- if (createVO.getDepartureLongitude() != null) {
- task.setDepartureLongitude(createVO.getDepartureLongitude());
- }
- if (createVO.getDepartureLatitude() != null) {
- task.setDepartureLatitude(createVO.getDepartureLatitude());
- }
- if (createVO.getDestinationLongitude() != null) {
- task.setDestinationLongitude(createVO.getDestinationLongitude());
- }
- if (createVO.getDestinationLatitude() != null) {
- task.setDestinationLatitude(createVO.getDestinationLatitude());
- }
- if (createVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(createVO.getEstimatedDistance());
- }
-
- // 璁剧疆鎬ユ晳杞繍鐗瑰畾淇℃伅
- if (createVO.getTransferTime() != null) {
- task.setPlannedStartTime(createVO.getTransferTime());
- }
- if (createVO.getTransferDistance() != null) {
- task.setEstimatedDistance(createVO.getTransferDistance());
- }
-
- // 璁剧疆绂忕杞︾壒瀹氫俊鎭�
- if (createVO.getServiceTime() != null) {
- task.setPlannedStartTime(createVO.getServiceTime());
- }
- if (createVO.getStartAddress() != null) {
- task.setDepartureAddress(createVO.getStartAddress());
- }
- if (createVO.getEndAddress() != null) {
- task.setDestinationAddress(createVO.getEndAddress());
- }
- // 璁剧疆绂忕杞﹀叕閲屾暟
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+ // 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
+ setAddressAndCoordinatesFromVO(task, createVO);
+ // 璁剧疆浠诲姟绫诲瀷鐗瑰畾淇℃伅
+ setTaskTypeSpecificInfo(task, createVO);
+ // 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
+ autoFillMissingGpsCoordinates(task);
int result = sysTaskMapper.insertSysTask(task);
// 淇濆瓨杞﹁締鍏宠仈淇℃伅
if (result > 0 && createVO.getVehicleIds() != null && !createVO.getVehicleIds().isEmpty()) {
- for (Long vehicleId : createVO.getVehicleIds()) {
- SysTaskVehicle taskVehicle = new SysTaskVehicle();
- taskVehicle.setTaskId(task.getTaskId());
- taskVehicle.setVehicleId(vehicleId);
- taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
- taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setCreateBy(SecurityUtils.getUsername());
- taskVehicle.setCreateTime(DateUtils.getNowDate());
- taskVehicle.setUpdateBy(SecurityUtils.getUsername());
- taskVehicle.setUpdateTime(DateUtils.getNowDate());
-
- sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
- }
+ sysTaskVehicleService.saveTaskVehicles(task.getTaskId(), createVO.getVehicleIds(), username);
}
// 淇濆瓨鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
- saveTaskAssignees(task.getTaskId(), createVO.getAssignees(),username);
+ sysTaskAssigneeService.saveTaskAssignees(task.getTaskId(), createVO.getAssignees(),username);
}
// 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
- saveEmergencyInfo(task.getTaskId(),username, createVO,null,null);
+ sysEmergencyTaskService.saveEmergencyInfo(task.getTaskId(), username, createVO, null, null, null);
}
// 淇濆瓨绂忕杞︽墿灞曚俊鎭�
if (result > 0 && "WELFARE".equals(createVO.getTaskType())) {
- saveWelfareInfo(task.getTaskId(),SecurityUtils.getUsername(), createVO);
+ sysWelfareTaskService.saveWelfareInfo(task.getTaskId(), SecurityUtils.getUsername(), createVO);
}
// 璁板綍鎿嶄綔鏃ュ織
@@ -257,25 +315,7 @@
));
}
- // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
- if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
- List<Long> assigneeIds = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserId())
- .collect(Collectors.toList());
- List<String> assigneeNames = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserName())
- .collect(Collectors.toList());
-
- eventPublisher.publishEvent(new TaskAssignedEvent(
- this,
- task.getTaskId(),
- task.getTaskCode(),
- assigneeIds,
- assigneeNames,
- SecurityUtils.getUserId(),
- SecurityUtils.getUsername()
- ));
- }
+
// 寮傛鍚屾鎬ユ晳杞繍浠诲姟鍒版棫绯荤粺
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType()) && legacySystemSyncService != null) {
@@ -305,7 +345,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,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());
@@ -331,40 +371,24 @@
task.setRemark(createVO.getRemark());
task.setDelFlag("0");
+ Boolean isHeadPush=this.isTaskHeaderPush(userId, deptId);
+ if(isHeadPush){
+ task.setIsHeadPush("1");
+ }else{
+ task.setIsHeadPush("0");
+ }
+
- // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
- if (createVO.getDepartureAddress() != null) {
- task.setDepartureAddress(createVO.getDepartureAddress());
- }
- if (createVO.getDestinationAddress() != null) {
- task.setDestinationAddress(createVO.getDestinationAddress());
- }
- if (createVO.getDepartureLongitude() != null) {
- task.setDepartureLongitude(createVO.getDepartureLongitude());
- }
- if (createVO.getDepartureLatitude() != null) {
- task.setDepartureLatitude(createVO.getDepartureLatitude());
- }
- if (createVO.getDestinationLongitude() != null) {
- task.setDestinationLongitude(createVO.getDestinationLongitude());
- }
- if (createVO.getDestinationLatitude() != null) {
- task.setDestinationLatitude(createVO.getDestinationLatitude());
- }
- if (createVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(createVO.getEstimatedDistance());
- }
-
- // 璁剧疆鎬ユ晳杞繍鐗瑰畾淇℃伅
+ // 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
+ setAddressAndCoordinatesFromVO(task, createVO);
+ // 璁剧疆浠诲姟绫诲瀷鐗瑰畾淇℃伅锛堟敞锛歩nsertTask浣跨敤plannedStartTime鑰岄潪serviceTime锛�
if (createVO.getTransferTime() != null) {
task.setPlannedStartTime(createVO.getTransferTime());
}
if (createVO.getTransferDistance() != null) {
task.setEstimatedDistance(createVO.getTransferDistance());
}
-
- // 璁剧疆绂忕杞︾壒瀹氫俊鎭�
if (createVO.getPlannedStartTime() != null) {
task.setPlannedStartTime(createVO.getPlannedStartTime());
}
@@ -374,44 +398,33 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- // 璁剧疆绂忕杞﹀叕閲屾暟
if (createVO.getDistance() != null) {
task.setEstimatedDistance(createVO.getDistance());
}
+ // 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
+ autoFillMissingGpsCoordinates(task);
int result = sysTaskMapper.insertSysTask(task);
// 淇濆瓨杞﹁締鍏宠仈淇℃伅
if (result > 0 && createVO.getVehicleIds() != null && !createVO.getVehicleIds().isEmpty()) {
- for (Long vehicleId : createVO.getVehicleIds()) {
- SysTaskVehicle taskVehicle = new SysTaskVehicle();
- taskVehicle.setTaskId(task.getTaskId());
- taskVehicle.setVehicleId(vehicleId);
- taskVehicle.setAssignTime(updateTime);
- taskVehicle.setAssignBy(userName);
- taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setCreateBy(userName);
- taskVehicle.setCreateTime(createTime);
- taskVehicle.setUpdateBy(userName);
- taskVehicle.setUpdateTime(updateTime);
-
- sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
- }
+ sysTaskVehicleService.saveTaskVehicles(task.getTaskId(), createVO.getVehicleIds(), userName,
+ updateTime, createTime, updateTime);
}
// 淇濆瓨鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
- saveTaskAssignees(task.getTaskId(), createVO.getAssignees(),userName);
+ sysTaskAssigneeService.saveTaskAssignees(task.getTaskId(), createVO.getAssignees(),userName);
}
// 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
- saveEmergencyInfo(task.getTaskId(),userName, createVO, serviceOrderId, dispatchOrderId);
+ sysEmergencyTaskService.saveEmergencyInfo(task.getTaskId(), userName, createVO, serviceOrderId, dispatchOrderId, serviceOrdNo);
}
// 淇濆瓨绂忕杞︽墿灞曚俊鎭�
if (result > 0 && "WELFARE".equals(createVO.getTaskType())) {
- saveWelfareInfo(task.getTaskId(),userName, createVO);
+ sysWelfareTaskService.saveWelfareInfo(task.getTaskId(), userName, createVO);
}
// 璁板綍鎿嶄綔鏃ュ織
@@ -432,16 +445,23 @@
));
}
- // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
- if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
- List<Long> assigneeIds = createVO.getAssignees().stream()
+
+ if(result>0) {
+ this.sendEmeryTaskProcess(task, dispatchOrderId);
+ }
+
+ return result;
+ }
+
+ private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
+ List<Long> assigneeIds = createVO.getAssignees().stream()
.map(assignee -> assignee.getUserId())
.collect(Collectors.toList());
- List<String> assigneeNames = createVO.getAssignees().stream()
+ List<String> assigneeNames = createVO.getAssignees().stream()
.map(assignee -> assignee.getUserName())
.collect(Collectors.toList());
-
- eventPublisher.publishEvent(new TaskAssignedEvent(
+
+ eventPublisher.publishEvent(new TaskAssignedEvent(
this,
task.getTaskId(),
task.getTaskCode(),
@@ -449,12 +469,7 @@
assigneeNames,
userId,
userName
- ));
- }
-
-
-
- return result;
+ ));
}
/**
@@ -465,84 +480,364 @@
*/
@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("浠诲姟涓嶅瓨鍦�");
}
+ Long userId = SecurityUtils.getUserId();
+ 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());
+
+ // 璁剧疆棰勮璺濈
+ 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());
+ }else{
+ task.setDeptId(oldTask.getDeptId());
+ }
+
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ task.setTaskCode(updateVO.getTaskCode());
+ }
+ //璁剧疆鎬婚儴鎺ㄩ��
+ task.setIsHeadPush(this.isTaskHeaderPush(oldTask.getCreatorId(), task.getDeptId())?"1":"0");
+ // 鑷姩鑾峰彇鍑哄彂鍦癎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);
+ }
+ }
+ }
+ if(updateVO.getAssignees()!=null && !updateVO.getAssignees().isEmpty()){
+ TaskCreateVO.AssigneeInfo assigneeInfo= updateVO.getAssignees().get(0);
+ task.setAssigneeId(assigneeInfo.getUserId());
+ task.setAssigneeName(assigneeInfo.getUserName());
+ }
+ // 鐢ㄤ簬璺熻釜鏄惁闇�瑕侀噸鏂板悓姝ワ紙杞﹁締銆佷汉鍛樸�佸湴鍧�銆佹垚浜や环鍙樻洿锛�
+ boolean needResync = true;
+ int result = sysTaskMapper.updateSysTask(task);
+
+
+
+ // 鏇存柊杞﹁締鍏宠仈
+ if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
+ boolean vehiclesChanged = sysTaskVehicleService.updateTaskVehicles(
+ updateVO.getTaskId(), updateVO.getVehicleIds(), userName);
+ if (vehiclesChanged) {
+ // 鏍囪闇�瑕侀噸鏂板悓姝ワ紙杞﹁締鍙樻洿锛�
+ needResync = true;
+ }
+ }
+
+ // 鏇存柊鎵ц浜哄憳锛堟娴嬩汉鍛樺彉鏇达級
+ if (result > 0 && updateVO.getAssignees() != null) {
+ boolean assigneesChanged = sysTaskAssigneeService.updateTaskAssignees(
+ updateVO.getTaskId(), updateVO.getAssignees(), userName);
+ if (assigneesChanged) {
+ // 鏍囪闇�瑕侀噸鏂板悓姝ワ紙浜哄憳鍙樻洿锛�
+ needResync = true;
+ }
+ }
+ Long dispatchOrderId=0L;
+ // 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅锛堟娴嬪湴鍧�鍜屾垚浜や环鍙樻洿锛�
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType())) {
+ SysTaskEmergency oldEmergency = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(updateVO.getTaskId());
+ sysEmergencyTaskService.updateEmergencyInfoFromUpdateVO(oldEmergency, updateVO, userName);
+ dispatchOrderId= oldEmergency.getLegacyDispatchOrdId();
+ sysEmergencyTaskService.markNeedResyncIfNecessary(updateVO.getTaskId(), oldTask, updateVO, updateFromLegacy);
+ }
+
+ // 鏇存柊绂忕杞︽墿灞曚俊鎭�
+ if (result > 0 && "WELFARE".equals(oldTask.getTaskType())) {
+ if (updateVO.getPassenger() != null || updateVO.getStartAddress() != null || updateVO.getEndAddress() != null) {
+ sysWelfareTaskService.updateWelfareInfo(updateVO.getTaskId(), updateVO, userName);
+ }
+ }
+
+ // 濡傛灉鏄�ユ晳杞繍浠诲姟涓旀湁鍙樻洿锛屾爣璁伴渶瑕侀噸鏂板悓姝�
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && needResync && !updateFromLegacy) {
+ sysEmergencyTaskService.markNeedResyncIfNecessary(updateVO.getTaskId(), oldTask, updateVO, updateFromLegacy);
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
+ buildTaskDescription(oldTask), buildTaskDescription(task),
+ userId, userName);
+ }
+
+ if(result > 0 && oldTask.getTaskStatus().equals(TaskStatus.PENDING.getCode())
+ && updateVO.getAssignees() != null
+ && !updateVO.getAssignees().isEmpty()
+ && LongUtil.isNotEmpty(dispatchOrderId)){
+
+ this.sendTaskAssigneeEvent(updateVO,oldTask,userId,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, Long serviceOrderId, Long dispatchOrderId, String serviceOrdNo,
+ Long userId, String userName, Long deptId, Date createTime, Date updateTime) {
+// log.info("寮�濮嬫洿鏂颁换鍔� ServiceOrdID: {} , dispatchOrdId:{}", serviceOrderId,dispatchOrderId);
+ // 閫氳繃鏃х郴缁熸湇鍔″崟ID鏌ユ壘浠诲姟
+ // 鑾峰彇鏃т换鍔′俊鎭紝鐢ㄤ簬鍒ゆ柇鍦板潃鏄惁鍙樻洿
+
+
+ SysTaskEmergency taskEmergency = sysTaskEmergencyMapper.selectByLegacyServiceOrdId(serviceOrderId);
+ Long taskId = taskEmergency.getTaskId();
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ updateVO.setTaskId(taskId);
+ if(updateVO.getTaskStatus()!=null){
+ task.setTaskStatus(updateVO.getTaskStatus());
+ }
+ task.setTaskDescription(updateVO.getTaskDescription());
task.setPlannedStartTime(updateVO.getPlannedStartTime());
task.setPlannedEndTime(updateVO.getPlannedEndTime());
- task.setAssigneeId(updateVO.getAssigneeId());
- task.setUpdateBy(SecurityUtils.getUsername());
+ if(updateVO.getActualStartTime() != null) {
+ task.setActualStartTime(updateVO.getActualStartTime());
+ }
+ if(updateVO.getActualEndTime() != null) {
+ task.setActualEndTime(updateVO.getActualEndTime());
+ }
+ if(deptId!=null){
+ task.setDeptId(deptId);
+ }
+
+
+// task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(userName);
task.setUpdateTime(DateUtils.getNowDate());
task.setRemark(updateVO.getRemark());
+
+ // 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
+
+ if(updateVO.getAssignees()!=null && !updateVO.getAssignees().isEmpty()){
+ TaskCreateVO.AssigneeInfo assigneeInfo= updateVO.getAssignees().get(0);
+ task.setAssigneeId(assigneeInfo.getUserId());
+ task.setAssigneeName(assigneeInfo.getUserName());
+ }
// 濡傛灉鏇存柊浜嗛儴闂↖D
if (updateVO.getDeptId() != null) {
task.setDeptId(updateVO.getDeptId());
}
- // 閲嶆柊璁＄畻棰勮鍏噷鏁�
- calculateEstimatedDistance(task);
-
- 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 = SecurityUtils.getUsername();
- 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);
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ 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
+ && !updateVO.getDepartureAddress().equals(task.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")));
+ modifyOutLongLat = true;
+// log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
}
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
}
}
+ task.setDepartureAddress(updateVO.getDepartureAddress());
+ if(!modifyOutLongLat){
+ task.setDepartureLongitude(updateVO.getDepartureLongitude());
+ task.setDepartureLatitude(updateVO.getDepartureLatitude());
+ }
+
+ Boolean modifyInLongLat = false;
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
+ if (task != null && updateVO.getDestinationAddress() != null
+ && !updateVO.getDestinationAddress().equals(task.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")));
+ modifyInLongLat = true;
+// log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+ task.setDestinationAddress(updateVO.getDestinationAddress());
+ if(!modifyInLongLat){
+ task.setDestinationLongitude(updateVO.getDestinationLongitude());
+ task.setDestinationLatitude(updateVO.getDestinationLatitude());
+ }
+ int result = sysTaskMapper.updateSysTask(task);
+// log.info("鏇存柊杞繍浠诲姟锛孲erviceOrdID:{},dispatchOrderId:{},result:{}",serviceOrderId,dispatchOrderId,result);
+// log.info("鏇存柊浠诲姟杞﹁締 ServiceOrdID: {} , dispatchOrdId:{},VehicleIds:{}", serviceOrderId,dispatchOrderId,updateVO.getVehicleIds());
+ // 鏇存柊杞﹁締鍏宠仈
+ if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
+// log.info("鏇存柊杞﹁締鍏宠仈 ServiceOrdID:{},dispatchOrderId:{}",serviceOrderId,dispatchOrderId);
+ sysTaskVehicleService.updateTaskVehicles(taskId, updateVO.getVehicleIds(), userName);
+ }
+
+ Boolean hasAssignee = updateVO.getAssigneeId() != null && !updateVO.getAssignees().isEmpty() ;
+// log.info("鏇存柊杞繍浠诲姟锛孲erviceOrdID:{},dispatchOrderId:{},result:{}, hasAssignee:{}",serviceOrderId,dispatchOrderId,result,hasAssignee);
+
+ // 鏇存柊鎵ц浜哄憳锛堟娴嬩汉鍛樺彉鏇达級
+ if (result > 0 && hasAssignee) {
+// log.info("鏇存柊鎵ц浜哄憳 ServiceOrdID:{},dispatchOrderId:{}",serviceOrderId,dispatchOrderId);
+ sysTaskAssigneeService.updateTaskAssignees(taskId, updateVO.getAssignees(), userName);
+ }
+
// 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅
- if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && updateVO.getEmergencyInfo() != null) {
- updateEmergencyInfo(updateVO.getTaskId(), updateVO);
- }
-
- // 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
- recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
- buildTaskDescription(oldTask), buildTaskDescription(task),
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ // 鏇存柊鏃х郴缁烮D
+ taskEmergency.setLegacyServiceOrdId(serviceOrderId);
+ if (LongUtil.isNotEmpty(dispatchOrderId)) {
+
+ taskEmergency.setLegacyDispatchOrdId(dispatchOrderId);
+ taskEmergency.setDispatchSyncStatus(2);
+ taskEmergency.setDispatchSyncTime(new Date());
+ taskEmergency.setDispatchSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
+ }
+ if (serviceOrdNo != null) {
+ taskEmergency.setLegacyServiceOrdNo(serviceOrdNo);
+ }
+ taskEmergency.setUpdateTime(DateUtils.getNowDate());
+
+ Boolean hasEmergencyInfo = updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null;
+
+
+ // 浣跨敤TaskCreateVO鐨勫瓧娈垫潵鏇存柊鎬ユ晳杞繍淇℃伅
+ if (hasEmergencyInfo) {
+ sysEmergencyTaskService.updateEmergencyInfoFromCreateVO(taskEmergency, updateVO, userName);
+ }
+ SysTaskEmergency emergency= sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ dispatchOrderId = emergency.getLegacyDispatchOrdId();
}
-
+
+ if(updateVO.getTaskStatus()!=null
+ && updateVO.getTaskStatus().equals(TaskStatus.PENDING.getCode())
+ && updateVO.getAssignees()!=null && !updateVO.getAssignees().isEmpty()
+ && LongUtil.isNotEmpty(dispatchOrderId)){
+ this.sendTaskAssigneeEvent(updateVO,task,userId,userName);
+ }
+
return result;
}
+ private void sendEmeryTaskProcess(SysTask task,Long dispatchOrderId){
+ Long taskId = task.getTaskId();
+ String taskCode = task.getShowTaskCode();
+ if(task.getTaskStatus()!=null && task.getTaskStatus().equals(TaskStatus.PENDING.getCode())){
+ //濡傛灉娌℃湁鍒嗛厤浜哄憳锛屼笖娌℃湁璋冨害鍗曪紝涓嶆槸骞垮窞鎬诲叕鍙哥殑灏遍渶瑕佸彂閫侀�氱煡璺熻繘
+ if(LongUtil.isEmpty(dispatchOrderId)){
+ if(!task.getDeptId().equals(DeptUtil.GUANGZHOU_DEPT_ID) && (task.getAssignees()==null || task.getAssignees().isEmpty())){
+ //鍙戦�侀�氱煡
+ eventPublisher.publishEvent(new TaskOnlyServerOrderSyncEvent(this, taskId, taskCode));
+
+ }
+ }
+ }
+ }
/**
* 鎵归噺鍒犻櫎浠诲姟绠＄悊
*
@@ -621,7 +916,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
}
@@ -636,7 +930,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog) {
SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (oldTask == null) {
@@ -688,7 +981,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(),
@@ -698,7 +994,11 @@
oldTaskStatus.getInfo(),
newStatus.getInfo(),
assigneeIds,
- oldTask.getCreatorId()
+ oldTask.getCreatorId(),
+ userId,
+ lng, lat,
+ address
+
));
}
@@ -716,39 +1016,7 @@
@Override
@Transactional
public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
- try {
- // 涓婁紶鏂囦欢锛岃繑鍥炵浉瀵硅矾寰勶紙濡傦細/task/2025/01/15/xxx.jpg锛�
- String fileName = category+"_"+System.currentTimeMillis()+"_"+file.getOriginalFilename();
-
- fileName=saveLocalPath(fileName,file.getInputStream());
-
- SysTaskAttachment attachment = new SysTaskAttachment();
- attachment.setTaskId(taskId);
- attachment.setFileName(file.getOriginalFilename());
- // 淇濆瓨鐩稿璺緞锛屼笉鍖呭惈 baseDir
- attachment.setFilePath(fileName);
- attachment.setFileSize(file.getSize());
- attachment.setFileType(getFileType(file.getOriginalFilename()));
- attachment.setAttachmentCategory(category);
- attachment.setUploadTime(DateUtils.getNowDate());
- attachment.setUploadBy(SecurityUtils.getUsername());
-
- Long result = sysTaskAttachmentMapper.insertSysTaskAttachment(attachment);
-
- // 璁板綍鎿嶄綔鏃ュ織
- if (result > 0) {
- String categoryDesc = getCategoryDesc(category);
- recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
- "涓婁紶鏂囦欢锛�" + file.getOriginalFilename() + "(鍒嗙被锛�" + categoryDesc + ")",
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
-
-
- }
-
- return attachment.getAttachmentId();
- } catch (IOException e) {
- throw new RuntimeException("鏂囦欢涓婁紶澶辫触锛�" + e.getMessage());
- }
+ return sysTaskAttachmentService.uploadAttachment(taskId, file, category);
}
/**
@@ -763,132 +1031,9 @@
@Override
@Transactional
public Long uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category) {
- try {
- // 浠庡井淇℃湇鍔″櫒涓嬭浇鏂囦欢
- String wechatUrl = String.format(
- "https://api.weixin.qq.com/cgi-bin/media/get?access_token=%s&media_id=%s",
- accessToken, mediaId
- );
-
- byte[] fileBytes = downloadFromUrl(wechatUrl);
- if (fileBytes == null || fileBytes.length == 0) {
- throw new RuntimeException("浠庡井淇′笅杞芥枃浠跺け璐�");
- }
-
- // 鐢熸垚鏂囦欢鍚嶏紙浣跨敤mediaId浣滀负鏂囦欢鍚嶇殑涓�閮ㄥ垎锛�
- String fileName = "wx_" + mediaId.substring(0, Math.min(20, mediaId.length())) + "_" + System.currentTimeMillis() + ".jpg";
-
- // 淇濆瓨鍒版湰鍦�
- String relativeFilePath = saveLocalPath(fileName, fileBytes);
-
- // 淇濆瓨闄勪欢璁板綍
- SysTaskAttachment attachment = new SysTaskAttachment();
- attachment.setTaskId(taskId);
- attachment.setFileName(fileName);
- // 淇濆瓨鐩稿璺緞
- attachment.setFilePath(relativeFilePath);
- attachment.setFileSize((long) fileBytes.length);
- attachment.setFileType("jpg");
- attachment.setAttachmentCategory(category);
- attachment.setUploadTime(DateUtils.getNowDate());
- attachment.setUploadBy(SecurityUtils.getUsername());
-
- Long result = sysTaskAttachmentMapper.insertSysTaskAttachment(attachment);
-
- // 璁板綍鎿嶄綔鏃ュ織
- if (result > 0) {
- String categoryDesc = getCategoryDesc(category);
- recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
- "閫氳繃寰俊涓婁紶鏂囦欢锛�" + fileName + "(鍒嗙被锛�" + categoryDesc + ")",
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
-
-
- }
-
- return attachment.getAttachmentId();
- } catch (Exception e) {
- throw new RuntimeException("浠庡井淇′笂浼犳枃浠跺け璐ワ細" + e.getMessage());
- }
+ return sysTaskAttachmentService.uploadAttachmentFromWechat(taskId, accessToken, mediaId, category);
}
- private static String saveLocalPath(String fileName, byte[] fileBytes) throws IOException {
- String baseDir = FileUploadUtils.getDefaultBaseDir();
- String datePath = DateUtils.datePath();
- String uploadDir = baseDir + "/task/" + datePath;
-
- // 鍒涘缓鐩綍
- File uploadPath = new File(uploadDir);
- if (!uploadPath.exists()) {
- uploadPath.mkdirs();
- }
-
- // 淇濆瓨鏂囦欢
- String filePath = uploadDir + "/" + fileName;
- File file = new File(filePath);
- try (FileOutputStream fos = new FileOutputStream(file)) {
- fos.write(fileBytes);
- }
-
- // 鐢熸垚鐩稿璺緞锛堜笉鍖呭惈baseDir锛�
- String relativeFilePath = "/task/" + datePath + "/" + fileName;
- return relativeFilePath;
- }
-
- private String saveLocalPath(String fileName,InputStream stream){
- String baseDir = FileUploadUtils.getDefaultBaseDir();
- String datePath = DateUtils.datePath();
- String uploadDir = baseDir + "/task/" + datePath;
-
- // 鍒涘缓鐩綍
- File uploadPath = new File(uploadDir);
- if (!uploadPath.exists()) {
- uploadPath.mkdirs();
- }
-
- // 淇濆瓨鏂囦欢
- String filePath = uploadDir + "/" + fileName;
- //灏唅nputstream鍐欏叆鏂囦欢
- try (OutputStream os = new FileOutputStream(filePath)) {
- byte[] buffer = new byte[1024]; // 缂撳啿鍖猴紝鍑忓皯 IO 娆℃暟
- int bytesRead;
- // 寰幆璇诲彇杈撳叆娴佷腑鐨勬暟鎹紝鍐欏叆杈撳嚭娴�
- while ((bytesRead = stream.read(buffer)) != -1) {
- os.write(buffer, 0, bytesRead);
- }
- os.flush(); // 寮哄埗鍒锋柊缂撳啿鍖猴紝纭繚鏁版嵁鍐欏叆鏂囦欢
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- // 鐢熸垚鐩稿璺緞锛堜笉鍖呭惈baseDir锛�
- String relativeFilePath = "/task/" + datePath + "/" + fileName;
- return relativeFilePath;
- }
-
- /**
- * 浠� URL 涓嬭浇鏂囦欢
- */
- private byte[] downloadFromUrl(String fileUrl) throws IOException {
- URL url = new URL(fileUrl);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.setConnectTimeout(10000);
- connection.setReadTimeout(30000);
-
- try (InputStream inputStream = connection.getInputStream()) {
- byte[] buffer = new byte[4096];
- int bytesRead;
- java.io.ByteArrayOutputStream outputStream = new java.io.ByteArrayOutputStream();
-
- while ((bytesRead = inputStream.read(buffer)) != -1) {
- outputStream.write(buffer, 0, bytesRead);
- }
-
- return outputStream.toByteArray();
- } finally {
- connection.disconnect();
- }
- }
/**
* 鍒犻櫎浠诲姟闄勪欢
@@ -899,28 +1044,7 @@
@Override
@Transactional
public int deleteAttachment(Long attachmentId) {
- SysTaskAttachment attachment = sysTaskAttachmentMapper.selectSysTaskAttachmentByAttachmentId(attachmentId);
- if (attachment == null) {
- throw new RuntimeException("闄勪欢涓嶅瓨鍦�");
- }
-
- // 鍒犻櫎鐗╃悊鏂囦欢
- try {
- FileUtils.deleteFile(attachment.getFilePath());
- } catch (Exception e) {
- // 蹇界暐鏂囦欢鍒犻櫎澶辫触
- }
-
- int result = sysTaskAttachmentMapper.deleteSysTaskAttachmentByAttachmentId(attachmentId);
-
- // 璁板綍鎿嶄綔鏃ュ織
- if (result > 0) {
- recordTaskLog(attachment.getTaskId(), "UPDATE", "鍒犻櫎闄勪欢",
- "鍒犻櫎鏂囦欢锛�" + attachment.getFileName(), null,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
- }
-
- return result;
+ return sysTaskAttachmentService.deleteAttachment(attachmentId);
}
/**
@@ -931,17 +1055,12 @@
*/
@Override
public SysTaskAttachment getAttachmentById(Long attachmentId) {
- SysTaskAttachment attachment = sysTaskAttachmentMapper.selectSysTaskAttachmentByAttachmentId(attachmentId);
- if (attachment != null) {
- // 鎷兼帴瀹屾暣URL
- buildAttachmentUrl(attachment);
- }
- return attachment;
+ return sysTaskAttachmentService.getAttachmentById(attachmentId);
}
@Override
public List<SysTaskAttachment> getAttachmentsByTaskId(Long taskId) {
- return sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId);
+ return sysTaskAttachmentService.getAttachmentsByTaskId(taskId);
}
/**
@@ -954,28 +1073,14 @@
*/
@Override
@Transactional
- public int assignVehicleToTask(Long taskId, Long vehicleId, String remark) {
- // 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
- int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
- if (exists > 0) {
- throw new RuntimeException("杞﹁締宸茬粡鍒嗛厤缁欒浠诲姟");
- }
-
- SysTaskVehicle taskVehicle = new SysTaskVehicle();
- taskVehicle.setTaskId(taskId);
- taskVehicle.setVehicleId(vehicleId);
- taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
- taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setRemark(remark);
-
- int result = sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+ public int assignVehicleToTask(Long taskId, Long vehicleId, String remark,Long userId,String userName) {
+ int result = sysTaskVehicleService.assignVehicleToTask(taskId, vehicleId, remark, userId, userName);
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締ID锛�" + vehicleId + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId, userName);
}
return result;
@@ -991,7 +1096,7 @@
@Override
@Transactional
public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
- int result = sysTaskVehicleMapper.deleteSysTaskVehicleByTaskIdAndVehicleId(taskId, vehicleId);
+ int result = sysTaskVehicleService.unassignVehicleFromTask(taskId, vehicleId);
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
@@ -1013,36 +1118,14 @@
*/
@Override
@Transactional
- public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark) {
- List<SysTaskVehicle> taskVehicles = new ArrayList<>();
- Date now = DateUtils.getNowDate();
- String assignBy = SecurityUtils.getUsername();
-
- for (Long vehicleId : vehicleIds) {
- // 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
- int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
- if (exists == 0) {
- SysTaskVehicle taskVehicle = new SysTaskVehicle();
- taskVehicle.setTaskId(taskId);
- taskVehicle.setVehicleId(vehicleId);
- taskVehicle.setAssignTime(now);
- taskVehicle.setAssignBy(assignBy);
- taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setRemark(remark);
- taskVehicles.add(taskVehicle);
- }
- }
-
- int result = 0;
- if (!taskVehicles.isEmpty()) {
- result = sysTaskVehicleMapper.batchInsertSysTaskVehicle(taskVehicles);
- }
+ public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark,Long userId,String userName) {
+ int result = sysTaskVehicleService.assignMultipleVehiclesToTask(taskId, vehicleIds, remark, userId, userName);
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鎵归噺鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締鏁伴噺锛�" + result + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId, userName);
}
return result;
@@ -1056,7 +1139,7 @@
*/
@Override
public List<SysTaskVehicle> getTaskVehicles(Long taskId) {
- return sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId);
+ return sysTaskVehicleService.getTaskVehicles(taskId);
}
/**
@@ -1068,34 +1151,7 @@
*/
@Override
public List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType) {
- List<SysTaskVehicle> availableVehicles = new ArrayList<>();
-
- try {
- // 鏌ヨ鎵�鏈夌姸鎬佷负姝ｅ父鐨勮溅杈嗭紙涓嶉檺鍒堕儴闂級
- VehicleInfo queryParam = new VehicleInfo();
- queryParam.setStatus("0"); // 0琛ㄧず姝ｅ父鐘舵��
- // 涓嶈缃甦eptId锛屾煡璇㈡墍鏈夐儴闂ㄧ殑杞﹁締
- queryParam.setDeptId(deptId);
-
- List<VehicleInfo> vehicles = vehicleInfoMapper.selectVehicleInfoList(queryParam);
-
- // 杞崲涓篠ysTaskVehicle瀵硅薄
- for (VehicleInfo vehicle : vehicles) {
- SysTaskVehicle taskVehicle = new SysTaskVehicle();
- taskVehicle.setVehicleId(vehicle.getVehicleId());
- taskVehicle.setVehicleNo(vehicle.getVehicleNo());
- taskVehicle.setVehicleType(vehicle.getVehicleType());
- taskVehicle.setVehicleBrand(vehicle.getVehicleBrand());
- taskVehicle.setVehicleModel(vehicle.getVehicleModel());
- taskVehicle.setDeptName(vehicle.getDeptName()); // 娣诲姞閮ㄩ棬鍚嶇О
- availableVehicles.add(taskVehicle);
- }
- } catch (Exception e) {
- // 濡傛灉鏌ヨ澶辫触锛岃褰曟棩蹇楀苟杩斿洖绌哄垪琛�
- System.err.println("鏌ヨ鍙敤杞﹁締澶辫触: " + e.getMessage());
- }
-
- return availableVehicles;
+ return sysTaskVehicleService.getAvailableVehicles(deptId, taskType);
}
/**
@@ -1126,7 +1182,14 @@
*/
@Override
public List<SysTask> selectMyTasks(Long userId) {
- return sysTaskMapper.selectMyTasks(userId);
+ List<SysTask> list = sysTaskMapper.selectMyTasks(userId);
+ list.stream().forEach(task -> {
+
+ if(task.getTaskType().equals("EMERGENCY_TRANSFER")){
+ task.setEmergencyInfo(sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId()));
+ }
+ });
+ return list;
}
/**
@@ -1140,16 +1203,13 @@
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task != null) {
// 鏌ヨ鍏宠仈杞﹁締
- task.setAssignedVehicles(sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId));
- // 鏌ヨ闄勪欢
- List<SysTaskAttachment> attachments = sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId);
- // 涓烘瘡涓檮浠舵嫾鎺ュ畬鏁碪RL
- if (attachments != null && !attachments.isEmpty()) {
- attachments.forEach(this::buildAttachmentUrl);
- }
- task.setAttachments(attachments);
+ task.setAssignedVehicles(sysTaskVehicleService.getTaskVehicles(taskId));
+ // 鏌ヨ闄勪欢锛堝凡鑷姩鎷兼帴瀹屾暣URL锛�
+ task.setAttachments(sysTaskAttachmentService.getAttachmentsByTaskId(taskId));
// 鏌ヨ鎿嶄綔鏃ュ織
task.setOperationLogs(sysTaskLogMapper.selectSysTaskLogByTaskId(taskId));
+ // 鏌ヨ鎵ц浜哄憳鍒楄〃
+ task.setAssignees(sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId));
// 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
@@ -1157,7 +1217,7 @@
}
// 鍔犺浇绂忕杞︽墿灞曚俊鎭�
else if ("WELFARE".equals(task.getTaskType())) {
- SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ SysTaskWelfare welfareInfo = sysWelfareTaskService.getWelfareInfoByTaskId(taskId);
task.setWelfareInfo(welfareInfo);
}
}
@@ -1184,13 +1244,7 @@
*/
@Override
public boolean hasLegacyServiceOrdId(Long taskId) {
- // 鍙湁鎬ユ晳杞繍浠诲姟鎵嶆湁鏃х郴缁烮D
- SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
- if (task != null && "EMERGENCY_TRANSFER".equals(task.getTaskType())) {
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
- return emergencyInfo != null && emergencyInfo.getLegacyServiceOrdId() != null;
- }
- return false;
+ return sysEmergencyTaskService.hasLegacyServiceOrdId(taskId);
}
/**
@@ -1201,13 +1255,7 @@
*/
@Override
public boolean hasLegacyDispatchOrdId(Long taskId) {
- // 鍙湁鎬ユ晳杞繍浠诲姟鎵嶆湁鏃х郴缁烮D
- SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
- if (task != null && "EMERGENCY_TRANSFER".equals(task.getTaskType())) {
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
- return emergencyInfo != null && emergencyInfo.getLegacyDispatchOrdId() != null;
- }
- return false;
+ return sysEmergencyTaskService.hasLegacyDispatchOrdId(taskId);
}
/**
@@ -1218,11 +1266,7 @@
*/
@Override
public boolean existsByLegacyServiceOrdId(Long legacyServiceOrdId) {
- if (legacyServiceOrdId == null) {
- return false;
- }
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectByLegacyServiceOrdId(legacyServiceOrdId);
- return emergencyInfo != null;
+ return sysEmergencyTaskService.existsByLegacyServiceOrdId(legacyServiceOrdId);
}
/**
@@ -1233,11 +1277,7 @@
*/
@Override
public boolean existsByLegacyDispatchOrdId(Long legacyDispatchOrdId) {
- if (legacyDispatchOrdId == null) {
- return false;
- }
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectByLegacyDispatchOrdId(legacyDispatchOrdId);
- return emergencyInfo != null;
+ return sysEmergencyTaskService.existsByLegacyDispatchOrdId(legacyDispatchOrdId);
}
@Autowired
@@ -1250,6 +1290,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;
}
/**
@@ -1319,21 +1383,109 @@
return sb.toString();
}
+
/**
- * 鑾峰彇鏂囦欢绫诲瀷
+ * 浠嶵askCreateVO璁剧疆鍦板潃鍜屽潗鏍囦俊鎭埌浠诲姟瀵硅薄
*
- * @param fileName 鏂囦欢鍚�
- * @return 鏂囦欢绫诲瀷
+ * @param task 浠诲姟瀵硅薄
+ * @param createVO 鍒涘缓VO
*/
- private String getFileType(String fileName) {
- if (StringUtils.isEmpty(fileName)) {
- return "";
+ private void setAddressAndCoordinatesFromVO(SysTask task, TaskCreateVO createVO) {
+ // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
+ if (createVO.getDepartureAddress() != null) {
+ task.setDepartureAddress(createVO.getDepartureAddress());
}
- int lastDotIndex = fileName.lastIndexOf(".");
- if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) {
- return fileName.substring(lastDotIndex + 1).toLowerCase();
+ if (createVO.getDestinationAddress() != null) {
+ task.setDestinationAddress(createVO.getDestinationAddress());
}
- return "";
+ if (createVO.getDepartureLongitude() != null) {
+ task.setDepartureLongitude(createVO.getDepartureLongitude());
+ }
+ if (createVO.getDepartureLatitude() != null) {
+ task.setDepartureLatitude(createVO.getDepartureLatitude());
+ }
+ if (createVO.getDestinationLongitude() != null) {
+ task.setDestinationLongitude(createVO.getDestinationLongitude());
+ }
+ if (createVO.getDestinationLatitude() != null) {
+ task.setDestinationLatitude(createVO.getDestinationLatitude());
+ }
+ if (createVO.getEstimatedDistance() != null) {
+ task.setEstimatedDistance(createVO.getEstimatedDistance());
+ }
+ }
+
+ /**
+ * 璁剧疆浠诲姟绫诲瀷鐗瑰畾淇℃伅锛堟�ユ晳杞繍/绂忕杞︼級
+ *
+ * @param task 浠诲姟瀵硅薄
+ * @param createVO 鍒涘缓VO
+ */
+ private void setTaskTypeSpecificInfo(SysTask task, TaskCreateVO createVO) {
+ // 璁剧疆鎬ユ晳杞繍鐗瑰畾淇℃伅
+ if (createVO.getTransferTime() != null) {
+ task.setPlannedStartTime(createVO.getTransferTime());
+ }
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
+ }
+
+ // 璁剧疆绂忕杞︾壒瀹氫俊鎭�
+ if (createVO.getServiceTime() != null) {
+ task.setPlannedStartTime(createVO.getServiceTime());
+ }
+ if (createVO.getStartAddress() != null) {
+ task.setDepartureAddress(createVO.getStartAddress());
+ }
+ if (createVO.getEndAddress() != null) {
+ task.setDestinationAddress(createVO.getEndAddress());
+ }
+ if (createVO.getDistance() != null) {
+ task.setEstimatedDistance(createVO.getDistance());
+ }
+ }
+
+ /**
+ * 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
+ *
+ * @param task 浠诲姟瀵硅薄
+ */
+ private void autoFillMissingGpsCoordinates(SysTask task) {
+ // 鑷姩鑾峰彇鍑哄彂鍦癎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")));
+ }
+ } 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")));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
}
/**
@@ -1367,327 +1519,130 @@
}
/**
- * 淇濆瓨浠诲姟鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ * 妫�鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙�
+ * 妫�鏌ワ細
+ * 1. 杞﹁締鏄惁鏈夋湭瀹屾垚鐨勪换鍔�
+ * 2. 鎵ц浜哄憳鏄惁鏈夋湭瀹屾垚鐨勪换鍔�
*
* @param taskId 浠诲姟ID
- * @param assignees 鎵ц浜哄憳淇℃伅鍒楄〃
+ * @return AjaxResult 鏍￠獙缁撴灉
*/
- private void saveTaskAssignees(Long taskId, java.util.List<TaskCreateVO.AssigneeInfo> assignees,String userName) {
- if (assignees == null || assignees.isEmpty()) {
- return;
+ @Override
+ public AjaxResult checkTaskCanDepart(Long taskId) {
+ // 鑾峰彇浠诲姟璇︽儏
+ SysTask task = this.getTaskDetail(taskId);
+ if (task == null) {
+ return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
- java.util.List<SysTaskAssignee> taskAssignees = new java.util.ArrayList<>();
- Date now = DateUtils.getNowDate();
- String currentUser = userName;
+ List<Map<String, Object>> conflicts = new ArrayList<>();
- for (int i = 0; i < assignees.size(); i++) {
- TaskCreateVO.AssigneeInfo assigneeInfo = assignees.get(i);
-
- SysTaskAssignee taskAssignee = new SysTaskAssignee();
- taskAssignee.setTaskId(taskId);
- taskAssignee.setUserId(assigneeInfo.getUserId());
- taskAssignee.setUserName(assigneeInfo.getUserName());
- taskAssignee.setUserType(assigneeInfo.getUserType());
- // 绗竴涓墽琛屼汉鍛樹负涓昏鎵ц浜�
- taskAssignee.setIsPrimary(i == 0 ? "1" : "0");
- taskAssignee.setSortOrder(i);
- taskAssignee.setCreateTime(now);
- taskAssignee.setCreateBy(currentUser);
- taskAssignee.setUpdateTime(now);
- taskAssignee.setUpdateBy(currentUser);
-
- taskAssignees.add(taskAssignee);
- }
-
- // 鎵归噺淇濆瓨
- if (!taskAssignees.isEmpty()) {
- sysTaskAssigneeMapper.batchInsertSysTaskAssignee(taskAssignees);
- }
- }
-
- /**
- * 淇濆瓨鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
- *
- * @param taskId 浠诲姟ID
- * @param createVO 浠诲姟鍒涘缓瀵硅薄
- */
- private void saveEmergencyInfo(Long taskId,String createUserName, TaskCreateVO createVO,String serviceOrderId,String dispatchOrderId) {
- SysTaskEmergency emergencyInfo = new SysTaskEmergency();
- emergencyInfo.setTaskId(taskId);
-
- // 璁剧疆鎮ｈ�呬俊鎭�
- if (createVO.getPatient() != null) {
- emergencyInfo.setPatientContact(createVO.getPatient().getContact());
- emergencyInfo.setPatientPhone(createVO.getPatient().getPhone());
- emergencyInfo.setPatientName(createVO.getPatient().getName());
- emergencyInfo.setPatientGender(createVO.getPatient().getGender());
- emergencyInfo.setPatientIdCard(createVO.getPatient().getIdCard());
- emergencyInfo.setPatientCondition(createVO.getPatient().getCondition());
- }
-
- // 璁剧疆杞嚭鍖婚櫌淇℃伅
- if (createVO.getHospitalOut() != null) {
- emergencyInfo.setHospitalOutId(createVO.getHospitalOut().getId());
- emergencyInfo.setHospitalOutName(createVO.getHospitalOut().getName());
- emergencyInfo.setHospitalOutDepartment(createVO.getHospitalOut().getDepartment());
- 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());
- }
-
- // 璁剧疆杞叆鍖婚櫌淇℃伅
- if (createVO.getHospitalIn() != null) {
- emergencyInfo.setHospitalInId(createVO.getHospitalIn().getId());
- emergencyInfo.setHospitalInName(createVO.getHospitalIn().getName());
- emergencyInfo.setHospitalInDepartment(createVO.getHospitalIn().getDepartment());
- 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());
- }
-
- // 璁剧疆璐圭敤淇℃伅
- emergencyInfo.setTransferDistance(createVO.getTransferDistance());
- emergencyInfo.setTransferPrice(createVO.getPrice());
-
- // 璁剧疆鍗曟嵁绫诲瀷ID
- emergencyInfo.setDocumentTypeId(createVO.getDocumentTypeId());
-
- // 璁剧疆浠诲姟绫诲瀷ID
- emergencyInfo.setTaskTypeId(createVO.getTaskTypeId());
-
- // 璁剧疆鐥呮儏ID鍒楄〃锛堝皢List<Long>杞崲涓洪�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
- if (createVO.getDiseaseIds() != null && !createVO.getDiseaseIds().isEmpty()) {
- String diseaseIdsStr = createVO.getDiseaseIds().stream()
- .map(String::valueOf)
- .collect(Collectors.joining(","));
- emergencyInfo.setDiseaseIds(diseaseIdsStr);
- }
-
- if(serviceOrderId!=null){
- emergencyInfo.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
- emergencyInfo.setSyncStatus(2);
- emergencyInfo.setSyncTime(new Date());
- emergencyInfo.setSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
- }
- if(dispatchOrderId!=null){
- emergencyInfo.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
- emergencyInfo.setDispatchSyncStatus(2);
- emergencyInfo.setDispatchSyncTime(new Date());
- emergencyInfo.setDispatchSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
-
- // 绯荤粺瀛楁
- }
- // 绯荤粺瀛楁
- emergencyInfo.setCreateTime(DateUtils.getNowDate());
- emergencyInfo.setUpdateTime(DateUtils.getNowDate());
- emergencyInfo.setCreateBy(createUserName);
- emergencyInfo.setUpdateBy(createUserName);
-
- sysTaskEmergencyMapper.insertSysTaskEmergency(emergencyInfo);
- }
-
- /**
- * 鏇存柊鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
- *
- * @param taskId 浠诲姟ID
- * @param updateVO 浠诲姟鏇存柊瀵硅薄
- */
- private void updateEmergencyInfo(Long taskId, TaskUpdateVO updateVO) {
- // 鏌ヨ鐜版湁鐨勬墿灞曚俊鎭�
- SysTaskEmergency existingInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
- if (existingInfo == null) {
- // 濡傛灉涓嶅瓨鍦紝鍒欏垱寤烘柊鐨�
- existingInfo = new SysTaskEmergency();
- existingInfo.setTaskId(taskId);
- existingInfo.setCreateTime(DateUtils.getNowDate());
- existingInfo.setCreateBy(SecurityUtils.getUsername());
- }
-
- TaskUpdateVO.EmergencyInfoVO emergencyInfo = updateVO.getEmergencyInfo();
-
- // 鏇存柊鎮ｈ�呬俊鎭�
- if (emergencyInfo.getPatientContact() != null) {
- existingInfo.setPatientContact(emergencyInfo.getPatientContact());
- }
- if (emergencyInfo.getPatientPhone() != null) {
- existingInfo.setPatientPhone(emergencyInfo.getPatientPhone());
- }
- if (emergencyInfo.getPatientName() != null) {
- existingInfo.setPatientName(emergencyInfo.getPatientName());
- }
- if (emergencyInfo.getPatientGender() != null) {
- existingInfo.setPatientGender(emergencyInfo.getPatientGender());
- }
- if (emergencyInfo.getPatientIdCard() != null) {
- existingInfo.setPatientIdCard(emergencyInfo.getPatientIdCard());
- }
- if (emergencyInfo.getPatientCondition() != null) {
- existingInfo.setPatientCondition(emergencyInfo.getPatientCondition());
- }
-
- // 鏇存柊杞嚭鍖婚櫌淇℃伅
- if (emergencyInfo.getHospitalOutId() != null) {
- existingInfo.setHospitalOutId(emergencyInfo.getHospitalOutId());
- }
- if (emergencyInfo.getHospitalOutName() != null) {
- existingInfo.setHospitalOutName(emergencyInfo.getHospitalOutName());
- }
- if (emergencyInfo.getHospitalOutDepartment() != null) {
- existingInfo.setHospitalOutDepartment(emergencyInfo.getHospitalOutDepartment());
- }
- if (emergencyInfo.getHospitalOutDepartmentId() != null) {
- existingInfo.setHospitalOutDepartmentId(emergencyInfo.getHospitalOutDepartmentId());
- }
- if (emergencyInfo.getHospitalOutBedNumber() != null) {
- existingInfo.setHospitalOutBedNumber(emergencyInfo.getHospitalOutBedNumber());
- }
- if (emergencyInfo.getHospitalOutAddress() != null) {
- existingInfo.setHospitalOutAddress(emergencyInfo.getHospitalOutAddress());
- }
- if (emergencyInfo.getHospitalOutLongitude() != null) {
- existingInfo.setHospitalOutLongitude(emergencyInfo.getHospitalOutLongitude());
- }
- if (emergencyInfo.getHospitalOutLatitude() != null) {
- existingInfo.setHospitalOutLatitude(emergencyInfo.getHospitalOutLatitude());
- }
-
- // 鏇存柊杞叆鍖婚櫌淇℃伅
- if (emergencyInfo.getHospitalInId() != null) {
- existingInfo.setHospitalInId(emergencyInfo.getHospitalInId());
- }
- if (emergencyInfo.getHospitalInName() != null) {
- existingInfo.setHospitalInName(emergencyInfo.getHospitalInName());
- }
- if (emergencyInfo.getHospitalInDepartment() != null) {
- existingInfo.setHospitalInDepartment(emergencyInfo.getHospitalInDepartment());
- }
- if (emergencyInfo.getHospitalInDepartmentId() != null) {
- existingInfo.setHospitalInDepartmentId(emergencyInfo.getHospitalInDepartmentId());
- }
- if (emergencyInfo.getHospitalInBedNumber() != null) {
- existingInfo.setHospitalInBedNumber(emergencyInfo.getHospitalInBedNumber());
- }
- if (emergencyInfo.getHospitalInAddress() != null) {
- existingInfo.setHospitalInAddress(emergencyInfo.getHospitalInAddress());
- }
- if (emergencyInfo.getHospitalInLongitude() != null) {
- existingInfo.setHospitalInLongitude(emergencyInfo.getHospitalInLongitude());
- }
- if (emergencyInfo.getHospitalInLatitude() != null) {
- existingInfo.setHospitalInLatitude(emergencyInfo.getHospitalInLatitude());
- }
-
- // 鏇存柊璐圭敤淇℃伅
- if (emergencyInfo.getTransferDistance() != null) {
- existingInfo.setTransferDistance(emergencyInfo.getTransferDistance());
- }
- if (emergencyInfo.getTransferPrice() != null) {
- existingInfo.setTransferPrice(emergencyInfo.getTransferPrice());
- }
-
- // 鏇存柊鐥呮儏ID鍒楄〃
- if (updateVO.getDiseaseIds() != null && !updateVO.getDiseaseIds().isEmpty()) {
- String diseaseIdsStr = updateVO.getDiseaseIds().stream()
- .map(String::valueOf)
- .collect(Collectors.joining(","));
- existingInfo.setDiseaseIds(diseaseIdsStr);
- } else {
- // 濡傛灉鐥呮儏ID鍒楄〃涓虹┖锛屾竻绌鸿瀛楁
- existingInfo.setDiseaseIds(null);
- }
-
- // 绯荤粺瀛楁
- existingInfo.setUpdateTime(DateUtils.getNowDate());
- existingInfo.setUpdateBy(SecurityUtils.getUsername());
-
- // 鎵ц鏇存柊
- sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
- }
-
- /**
- * 淇濆瓨绂忕杞︿换鍔℃墿灞曚俊鎭�
- *
- * @param taskId 浠诲姟ID
- * @param createVO 浠诲姟鍒涘缓瀵硅薄
- */
- private void saveWelfareInfo(Long taskId,String userName, TaskCreateVO createVO) {
- SysTaskWelfare welfareInfo = new SysTaskWelfare();
- welfareInfo.setTaskId(taskId);
-
- // 璁剧疆涔樺淇℃伅
- if (createVO.getPassenger() != null) {
- welfareInfo.setPassengerContact(createVO.getPassenger().getContact());
- welfareInfo.setPassengerPhone(createVO.getPassenger().getPhone());
- }
-
- // 璁剧疆鍦板潃淇℃伅
- welfareInfo.setPickupAddress(createVO.getStartAddress());
- welfareInfo.setDestinationAddress(createVO.getEndAddress());
-
- // 璁剧疆GPS鍧愭爣
- welfareInfo.setPickupLongitude(createVO.getDepartureLongitude());
- welfareInfo.setPickupLatitude(createVO.getDepartureLatitude());
- welfareInfo.setDestinationLongitude(createVO.getDestinationLongitude());
- welfareInfo.setDestinationLatitude(createVO.getDestinationLatitude());
-
- // 璁剧疆璺濈鍜岃垂鐢�
- // 浼樺厛浣跨敤绂忕杞︿笓鐢ㄧ殑distance瀛楁锛屽鏋滄病鏈夊垯浣跨敤閫氱敤鐨別stimatedDistance
- BigDecimal serviceDistance = createVO.getDistance() != null ? createVO.getDistance() : createVO.getEstimatedDistance();
- welfareInfo.setServiceDistance(serviceDistance);
- welfareInfo.setServicePrice(createVO.getPrice());
-
- // 绯荤粺瀛楁
- welfareInfo.setCreateTime(DateUtils.getNowDate());
- welfareInfo.setUpdateTime(DateUtils.getNowDate());
- welfareInfo.setCreateBy(userName);
- welfareInfo.setUpdateBy(userName);
-
- sysTaskWelfareMapper.insertSysTaskWelfare(welfareInfo);
- }
-
- /**
- * 鑾峰彇闄勪欢鍒嗙被鎻忚堪
- *
- * @param category 闄勪欢鍒嗙被浠ｇ爜
- * @return 鍒嗙被鎻忚堪
- */
- private String getCategoryDesc(String category) {
- if (category == null || category.isEmpty()) {
- return "鏈垎绫�";
- }
- switch (category) {
- case "1": return "鐭ユ儏鍚屾剰涔�";
- case "2": return "鐥呬汉璧勬枡";
- case "3": return "鎿嶄綔璁板綍";
- case "4": return "鍑鸿溅鍓�";
- case "5": return "鍑鸿溅鍚�";
- case "6": return "绯诲畨鍏ㄥ甫";
- default: return "鍏朵粬";
- }
- }
-
- /**
- * 鏋勫缓闄勪欢鐨勫畬鏁碪RL
- *
- * @param attachment 闄勪欢瀵硅薄
- */
- private void buildAttachmentUrl(SysTaskAttachment attachment) {
- if (attachment != null && StringUtils.isNotEmpty(attachment.getFilePath())) {
- String imageUrl = imageUrlConfig.getImageUrl();
- if (StringUtils.isNotEmpty(imageUrl)) {
- // 鎷兼帴瀹屾暣URL锛氬煙鍚� + 鐩稿璺緞
- attachment.setFileUrl(imageUrl + attachment.getFilePath());
- } else {
- // 濡傛灉鏈厤缃煙鍚嶏紝鐩存帴浣跨敤鐩稿璺緞
- attachment.setFileUrl(attachment.getFilePath());
+ // 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 AjaxResult.success(result);
}
-
+
+ /**
+ * 鎵ц浜虹偣鍑诲氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public AjaxResult setAssigneeReady(Long taskId, Long userId) {
+ return sysTaskAssigneeService.setAssigneeReady(taskId, userId);
+ }
+
+ /**
+ * 鍙栨秷鎵ц浜哄氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
+ return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
+ }
}
--
Gitblit v1.9.1