From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 187 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 180 insertions(+), 7 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 baaece3..ac521d2 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
@@ -4,6 +4,7 @@
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
+import java.util.stream.Collectors;
import java.io.File;
import java.io.IOException;
@@ -24,6 +25,7 @@
import com.ruoyi.system.domain.SysTaskLog;
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;
@@ -35,9 +37,16 @@
import com.ruoyi.system.mapper.SysTaskLogMapper;
import com.ruoyi.system.mapper.SysTaskEmergencyMapper;
import com.ruoyi.system.mapper.SysTaskWelfareMapper;
+import com.ruoyi.system.mapper.SysTaskAssigneeMapper;
import com.ruoyi.system.mapper.VehicleInfoMapper;
import com.ruoyi.system.domain.VehicleInfo;
import com.ruoyi.system.service.ISysTaskService;
+import com.ruoyi.system.service.ILegacySystemSyncService;
+import com.ruoyi.system.event.TaskCreatedEvent;
+import com.ruoyi.system.event.TaskAssignedEvent;
+import com.ruoyi.system.event.TaskStatusChangedEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
/**
* 浠诲姟绠＄悊Service涓氬姟灞傚鐞�
@@ -67,7 +76,16 @@
private SysTaskWelfareMapper sysTaskWelfareMapper;
@Autowired
+ private SysTaskAssigneeMapper sysTaskAssigneeMapper;
+
+ @Autowired
private VehicleInfoMapper vehicleInfoMapper;
+
+ @Autowired(required = false)
+ private ILegacySystemSyncService legacySystemSyncService;
+
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
/**
* 鏌ヨ浠诲姟绠＄悊
@@ -122,7 +140,8 @@
task.setPlannedEndTime(createVO.getPlannedEndTime());
task.setAssigneeId(createVO.getAssigneeId());
task.setCreatorId(SecurityUtils.getUserId());
- task.setDeptId(SecurityUtils.getDeptId());
+ // 浼樺厛浣跨敤鍓嶇浼犲叆鐨勯儴闂↖D锛屽鏋滄病鏈夊垯浣跨敤褰撳墠鐢ㄦ埛鐨勯儴闂↖D
+ task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId());
task.setCreateBy(SecurityUtils.getUsername());
task.setCreateTime(DateUtils.getNowDate());
task.setUpdateBy(SecurityUtils.getUsername());
@@ -196,6 +215,11 @@
}
}
+ // 淇濆瓨鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
+ saveTaskAssignees(task.getTaskId(), createVO.getAssignees());
+ }
+
// 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
saveEmergencyInfo(task.getTaskId(), createVO);
@@ -210,6 +234,51 @@
if (result > 0) {
recordTaskLog(task.getTaskId(), "CREATE", "鍒涘缓浠诲姟", null,
"浠诲姟绫诲瀷锛�" + createVO.getTaskType(), SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ // 鍙戝竷浠诲姟鍒涘缓浜嬩欢
+ if (result > 0) {
+ eventPublisher.publishEvent(new TaskCreatedEvent(
+ this,
+ task.getTaskId(),
+ task.getTaskCode(),
+ task.getTaskType(),
+ task.getCreatorId(),
+ SecurityUtils.getUsername()
+ ));
+ }
+
+ // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
+ 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) {
+ final Long finalTaskId = task.getTaskId();
+ new Thread(() -> {
+ try {
+ Thread.sleep(2000); // 绛夊緟2绉掞紝纭繚浜嬪姟宸叉彁浜�
+ legacySystemSyncService.syncEmergencyTaskToLegacy(finalTaskId);
+ } catch (Exception e) {
+ // 鍚屾澶辫触涓嶅奖鍝嶄富娴佺▼锛屼粎璁板綍鏃ュ織
+ }
+ }).start();
}
return result;
@@ -290,19 +359,40 @@
@Override
@Transactional
public int assignTask(Long taskId, Long assigneeId, String remark) {
- SysTask task = new SysTask();
- task.setTaskId(taskId);
- task.setAssigneeId(assigneeId);
- task.setUpdateBy(SecurityUtils.getUsername());
- task.setUpdateTime(DateUtils.getNowDate());
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
- int result = sysTaskMapper.assignTask(task);
+ SysTask updateTask = new SysTask();
+ updateTask.setTaskId(taskId);
+ updateTask.setAssigneeId(assigneeId);
+ updateTask.setUpdateBy(SecurityUtils.getUsername());
+ updateTask.setUpdateTime(DateUtils.getNowDate());
+
+ int result = sysTaskMapper.assignTask(updateTask);
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鍒嗛厤浠诲姟", null,
"鍒嗛厤缁欑敤鎴稩D锛�" + assigneeId + "锛屽娉細" + remark,
SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
+ if (result > 0) {
+ List<Long> assigneeIds = new ArrayList<>();
+ assigneeIds.add(assigneeId);
+
+ eventPublisher.publishEvent(new TaskAssignedEvent(
+ this,
+ task.getTaskId(),
+ task.getTaskCode(),
+ assigneeIds,
+ null, // 濮撳悕鍒楄〃鍦ㄧ洃鍚櫒涓煡璇�
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUsername()
+ ));
}
return result;
@@ -372,6 +462,30 @@
"鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark,
SecurityUtils.getUserId(), SecurityUtils.getUsername(),
locationLog);
+ }
+
+ // 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
+ if (result > 0) {
+ // 鏌ヨ浠诲姟鐨勬墍鏈夋墽琛屼汉
+ List<SysTaskAssignee> assignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ List<Long> assigneeIds = null;
+ if (assignees != null && !assignees.isEmpty()) {
+ assigneeIds = assignees.stream()
+ .map(SysTaskAssignee::getUserId)
+ .collect(Collectors.toList());
+ }
+
+ eventPublisher.publishEvent(new TaskStatusChangedEvent(
+ this,
+ oldTask.getTaskId(),
+ oldTask.getTaskCode(),
+ oldTaskStatus.getCode(),
+ newStatus.getCode(),
+ oldTaskStatus.getInfo(),
+ newStatus.getInfo(),
+ assigneeIds,
+ oldTask.getCreatorId()
+ ));
}
return result;
@@ -580,6 +694,7 @@
VehicleInfo queryParam = new VehicleInfo();
queryParam.setStatus("0"); // 0琛ㄧず姝ｅ父鐘舵��
// 涓嶈缃甦eptId锛屾煡璇㈡墍鏈夐儴闂ㄧ殑杞﹁締
+ queryParam.setDeptId(deptId);
List<VehicleInfo> vehicles = vehicleInfoMapper.selectVehicleInfoList(queryParam);
@@ -790,6 +905,46 @@
}
/**
+ * 淇濆瓨浠诲姟鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ *
+ * @param taskId 浠诲姟ID
+ * @param assignees 鎵ц浜哄憳淇℃伅鍒楄〃
+ */
+ private void saveTaskAssignees(Long taskId, java.util.List<TaskCreateVO.AssigneeInfo> assignees) {
+ if (assignees == null || assignees.isEmpty()) {
+ return;
+ }
+
+ java.util.List<SysTaskAssignee> taskAssignees = new java.util.ArrayList<>();
+ Date now = DateUtils.getNowDate();
+ String currentUser = SecurityUtils.getUsername();
+
+ 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
@@ -811,8 +966,10 @@
// 璁剧疆杞嚭鍖婚櫌淇℃伅
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());
@@ -821,8 +978,10 @@
// 璁剧疆杞叆鍖婚櫌淇℃伅
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());
@@ -833,6 +992,20 @@
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);
+ }
+
// 绯荤粺瀛楁
emergencyInfo.setCreateTime(DateUtils.getNowDate());
emergencyInfo.setUpdateTime(DateUtils.getNowDate());
--
Gitblit v1.9.1