From f67945d53b20f6a45ae50b27d74c966eb1355bb4 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 16 十一月 2025 22:53:54 +0800
Subject: [PATCH] feat: 增加分段GPS计算行程距离
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 793 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 760 insertions(+), 33 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 093a6a4..796b509 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
@@ -1,10 +1,19 @@
package com.ruoyi.system.service.impl;
+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.io.File;
-import java.io.IOException;
+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.mapper.*;
+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;
@@ -12,22 +21,32 @@
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;
import com.ruoyi.system.domain.SysTaskVehicle;
import com.ruoyi.system.domain.SysTaskAttachment;
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;
import com.ruoyi.system.domain.vo.TaskStatisticsVO;
import com.ruoyi.system.domain.enums.TaskStatus;
-import com.ruoyi.system.mapper.SysTaskMapper;
-import com.ruoyi.system.mapper.SysTaskVehicleMapper;
-import com.ruoyi.system.mapper.SysTaskAttachmentMapper;
-import com.ruoyi.system.mapper.SysTaskLogMapper;
+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;
+import org.springframework.context.ApplicationEventPublisher;
/**
* 浠诲姟绠＄悊Service涓氬姟灞傚鐞�
@@ -37,6 +56,8 @@
*/
@Service
public class SysTaskServiceImpl implements ISysTaskService {
+
+ private static final Logger log = LoggerFactory.getLogger(SysTaskServiceImpl.class);
@Autowired
private SysTaskMapper sysTaskMapper;
@@ -49,6 +70,33 @@
@Autowired
private SysTaskLogMapper sysTaskLogMapper;
+
+ @Autowired
+ private SysTaskEmergencyMapper sysTaskEmergencyMapper;
+
+ @Autowired
+ private SysTaskWelfareMapper sysTaskWelfareMapper;
+
+ @Autowired
+ private SysTaskAssigneeMapper sysTaskAssigneeMapper;
+
+ @Autowired
+ private VehicleInfoMapper vehicleInfoMapper;
+
+ @Autowired(required = false)
+ private ILegacySystemSyncService legacySystemSyncService;
+
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
+
+ @Autowired
+ private ImageUrlConfig imageUrlConfig;
+
+ @Autowired(required = false)
+ private ITaskAttachmentSyncService taskAttachmentSyncService;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨ浠诲姟绠＄悊
@@ -58,7 +106,20 @@
*/
@Override
public SysTask selectSysTaskByTaskId(Long taskId) {
- return sysTaskMapper.selectSysTaskByTaskId(taskId);
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task != null) {
+ // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+ else if ("WELFARE".equals(task.getTaskType())) {
+ SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ task.setWelfareInfo(welfareInfo);
+ }
+ }
+ return task;
}
/**
@@ -86,24 +147,149 @@
task.setTaskType(createVO.getTaskType());
task.setTaskStatus(TaskStatus.PENDING.getCode());
task.setTaskDescription(createVO.getTaskDescription());
- task.setDepartureAddress(createVO.getDepartureAddress());
- task.setDestinationAddress(createVO.getDestinationAddress());
task.setPlannedStartTime(createVO.getPlannedStartTime());
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());
+ task.setUpdateTime(DateUtils.getNowDate());
task.setRemark(createVO.getRemark());
task.setDelFlag("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());
+ }
+
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);
+ }
+ }
+
+ // 淇濆瓨鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ 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);
+ }
+
+ // 淇濆瓨绂忕杞︽墿灞曚俊鎭�
+ if (result > 0 && "WELFARE".equals(createVO.getTaskType())) {
+ saveWelfareInfo(task.getTaskId(), createVO);
+ }
// 璁板綍鎿嶄綔鏃ュ織
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;
@@ -128,12 +314,19 @@
task.setTaskDescription(updateVO.getTaskDescription());
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);
int result = sysTaskMapper.updateSysTask(task);
@@ -177,18 +370,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());
+ 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;
@@ -205,6 +420,21 @@
@Override
@Transactional
public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
+ return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
+ }
+
+ /**
+ * 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
+ *
+ * @param taskId 浠诲姟ID
+ * @param newStatus 鏂扮姸鎬�
+ * @param remark 澶囨敞
+ * @param locationLog GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog) {
SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (oldTask == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
@@ -220,22 +450,53 @@
task.setTaskId(taskId);
task.setTaskStatus(newStatus.getCode());
task.setUpdateBy(SecurityUtils.getUsername());
+ task.setUpdateTime(DateUtils.getNowDate());
// 鏍规嵁鐘舵�佽缃浉搴旂殑鏃堕棿
- if (newStatus == TaskStatus.IN_PROGRESS && oldTask.getActualStartTime() == null) {
+ if (newStatus == TaskStatus.DEPARTING && oldTask.getActualStartTime() == null) {
+ // 鍑哄彂涓細璁剧疆瀹為檯寮�濮嬫椂闂�
+ task.setActualStartTime(DateUtils.getNowDate());
+ } else if (newStatus == TaskStatus.IN_PROGRESS && oldTask.getActualStartTime() == null) {
+ // 鍏煎鏃ф暟鎹細浠诲姟涓姸鎬佷篃璁剧疆瀹為檯寮�濮嬫椂闂�
task.setActualStartTime(DateUtils.getNowDate());
} else if (newStatus == TaskStatus.COMPLETED) {
+ // 宸插畬鎴愶細璁剧疆瀹為檯缁撴潫鏃堕棿
task.setActualEndTime(DateUtils.getNowDate());
}
int result = sysTaskMapper.updateTaskStatus(task);
- // 璁板綍鎿嶄綔鏃ュ織
+ // 璁板綍鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
if (result > 0) {
recordTaskLog(taskId, "STATUS_CHANGE", "鐘舵�佸彉鏇�",
"鐘舵�侊細" + oldTaskStatus.getInfo(),
"鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ 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;
@@ -246,37 +507,183 @@
*
* @param taskId 浠诲姟ID
* @param file 鏂囦欢
+ * @param category 闄勪欢鍒嗙被
* @return 缁撴灉
*/
@Override
@Transactional
- public int uploadAttachment(Long taskId, MultipartFile file) {
+ public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
try {
- // 涓婁紶鏂囦欢
- String fileName = FileUploadUtils.upload("/task", file);
- String filePath = FileUploadUtils.getDefaultBaseDir() + fileName;
+ // 涓婁紶鏂囦欢锛岃繑鍥炵浉瀵硅矾寰勶紙濡傦細/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());
- attachment.setFilePath(filePath);
+ // 淇濆瓨鐩稿璺緞锛屼笉鍖呭惈 baseDir
+ attachment.setFilePath(fileName);
attachment.setFileSize(file.getSize());
attachment.setFileType(getFileType(file.getOriginalFilename()));
+ attachment.setAttachmentCategory(category);
attachment.setUploadTime(DateUtils.getNowDate());
attachment.setUploadBy(SecurityUtils.getUsername());
- int result = sysTaskAttachmentMapper.insertSysTaskAttachment(attachment);
+ Long result = sysTaskAttachmentMapper.insertSysTaskAttachment(attachment);
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
+ String categoryDesc = getCategoryDesc(category);
recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
- "涓婁紶鏂囦欢锛�" + file.getOriginalFilename(),
+ "涓婁紶鏂囦欢锛�" + file.getOriginalFilename() + "(鍒嗙被锛�" + categoryDesc + ")",
SecurityUtils.getUserId(), SecurityUtils.getUsername());
+
+
}
- return result;
+ return attachment.getAttachmentId();
} catch (IOException e) {
throw new RuntimeException("鏂囦欢涓婁紶澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 浠庡井淇ediaId涓婁紶浠诲姟闄勪欢
+ *
+ * @param taskId 浠诲姟ID
+ * @param accessToken 寰俊AccessToken
+ * @param mediaId 寰俊mediaId
+ * @param category 闄勪欢鍒嗙被
+ * @return 杩斿洖闄勪欢ID
+ */
+ @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());
+ }
+ }
+
+ 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();
}
}
@@ -311,6 +718,27 @@
}
return result;
+ }
+
+ /**
+ * 鏍规嵁ID鑾峰彇闄勪欢璇︽儏
+ *
+ * @param attachmentId 闄勪欢ID
+ * @return 闄勪欢璇︽儏
+ */
+ @Override
+ public SysTaskAttachment getAttachmentById(Long attachmentId) {
+ SysTaskAttachment attachment = sysTaskAttachmentMapper.selectSysTaskAttachmentByAttachmentId(attachmentId);
+ if (attachment != null) {
+ // 鎷兼帴瀹屾暣URL
+ buildAttachmentUrl(attachment);
+ }
+ return attachment;
+ }
+
+ @Override
+ public List<SysTaskAttachment> getAttachmentsByTaskId(Long taskId) {
+ return sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId);
}
/**
@@ -437,9 +865,34 @@
*/
@Override
public List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType) {
- // 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫鏌ヨ鍙敤杞﹁締
- // 鏆傛椂杩斿洖绌哄垪琛紝瀹為檯瀹炵幇闇�瑕佹煡璇㈣溅杈嗚〃
- return new ArrayList<>();
+ 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;
}
/**
@@ -486,21 +939,50 @@
// 鏌ヨ鍏宠仈杞﹁締
task.setAssignedVehicles(sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId));
// 鏌ヨ闄勪欢
- task.setAttachments(sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId));
+ List<SysTaskAttachment> attachments = sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId);
+ // 涓烘瘡涓檮浠舵嫾鎺ュ畬鏁碪RL
+ if (attachments != null && !attachments.isEmpty()) {
+ attachments.forEach(this::buildAttachmentUrl);
+ }
+ task.setAttachments(attachments);
// 鏌ヨ鎿嶄綔鏃ュ織
task.setOperationLogs(sysTaskLogMapper.selectSysTaskLogByTaskId(taskId));
+ // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+ else if ("WELFARE".equals(task.getTaskType())) {
+ SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ task.setWelfareInfo(welfareInfo);
+ }
}
return task;
}
+ /**
+ * 妫�鏌ヨ溅杈嗘槸鍚︽湁姝ｅ湪杩涜涓殑浠诲姟
+ * 姝ｅ湪杩涜涓殑浠诲姟鏄寚鐘舵�佷笉涓猴細PENDING锛堝緟澶勭悊锛夈�丆OMPLETED锛堝凡瀹屾垚锛夈�丆ANCELLED锛堝凡鍙栨秷锛夌殑浠诲姟
+ *
+ * @param vehicleId 杞﹁締ID
+ * @return 姝ｅ湪杩涜涓殑浠诲姟鍒楄〃
+ */
+ @Override
+ public List<SysTask> checkVehicleActiveTasks(Long vehicleId) {
+ return sysTaskMapper.selectActiveTasksByVehicleId(vehicleId);
+ }
+
+ @Autowired
+ private TaskCodeGenerator taskCodeGenerator;
+
/**
* 鐢熸垚浠诲姟缂栧彿
*
* @return 浠诲姟缂栧彿
*/
private String generateTaskCode() {
- String dateStr = DateUtils.dateTimeNow("yyyyMMdd");
- return "TASK" + dateStr + "0001";
+ return taskCodeGenerator.generateTaskCode();
}
/**
@@ -516,7 +998,29 @@
*/
private void recordTaskLog(Long taskId, String operationType, String operationDesc,
String oldValue, String newValue, Long operatorId, String operatorName) {
- SysTaskLog log = new SysTaskLog();
+ recordTaskLog(taskId, operationType, operationDesc, oldValue, newValue,
+ operatorId, operatorName, null);
+ }
+
+ /**
+ * 璁板綍浠诲姟鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
+ *
+ * @param taskId 浠诲姟ID
+ * @param operationType 鎿嶄綔绫诲瀷
+ * @param operationDesc 鎿嶄綔鎻忚堪
+ * @param oldValue 鎿嶄綔鍓嶅��
+ * @param newValue 鎿嶄綔鍚庡��
+ * @param operatorId 鎿嶄綔浜篒D
+ * @param operatorName 鎿嶄綔浜哄鍚�
+ * @param log GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄锛堝彲涓簄ull锛�
+ */
+ private void recordTaskLog(Long taskId, String operationType, String operationDesc,
+ String oldValue, String newValue, Long operatorId, String operatorName,
+ SysTaskLog log) {
+ if (log == null) {
+ log = new SysTaskLog();
+ }
+
log.setTaskId(taskId);
log.setOperationType(operationType);
log.setOperationDesc(operationDesc);
@@ -564,4 +1068,227 @@
}
return "";
}
+
+ /**
+ * 璁＄畻棰勮鍏噷鏁�
+ *
+ * @param task 浠诲姟瀵硅薄
+ */
+ private void calculateEstimatedDistance(SysTask task) {
+ if (task.getDepartureLongitude() != null && task.getDepartureLatitude() != null &&
+ task.getDestinationLongitude() != null && task.getDestinationLatitude() != null) {
+
+ // 楠岃瘉GPS鍧愭爣鏄惁鏈夋晥
+ if (GpsDistanceUtils.isValidCoordinate(task.getDepartureLatitude(), task.getDepartureLongitude()) &&
+ GpsDistanceUtils.isValidCoordinate(task.getDestinationLatitude(), task.getDestinationLongitude())) {
+
+ // 璁＄畻璺濈
+ java.math.BigDecimal distance = GpsDistanceUtils.calculateDistance(
+ task.getDepartureLatitude(), task.getDepartureLongitude(),
+ task.getDestinationLatitude(), task.getDestinationLongitude()
+ );
+
+ task.setEstimatedDistance(distance);
+ } else {
+ // 鍧愭爣鏃犳晥锛岃缃负0
+ task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+ }
+ } else {
+ // 鍧愭爣涓嶅畬鏁达紝璁剧疆涓�0
+ task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+ }
+ }
+
+ /**
+ * 淇濆瓨浠诲姟鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ *
+ * @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
+ * @param createVO 浠诲姟鍒涘缓瀵硅薄
+ */
+ private void saveEmergencyInfo(Long taskId, TaskCreateVO createVO) {
+ 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);
+ }
+
+ // 绯荤粺瀛楁
+ emergencyInfo.setCreateTime(DateUtils.getNowDate());
+ emergencyInfo.setUpdateTime(DateUtils.getNowDate());
+ emergencyInfo.setCreateBy(SecurityUtils.getUsername());
+ emergencyInfo.setUpdateBy(SecurityUtils.getUsername());
+
+ sysTaskEmergencyMapper.insertSysTaskEmergency(emergencyInfo);
+ }
+
+ /**
+ * 淇濆瓨绂忕杞︿换鍔℃墿灞曚俊鎭�
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓瀵硅薄
+ */
+ private void saveWelfareInfo(Long taskId, 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(SecurityUtils.getUsername());
+ welfareInfo.setUpdateBy(SecurityUtils.getUsername());
+
+ 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());
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.1