From 2f09efc660bf2cc94cbc5291ad25ca06fc9bdadf Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 24 一月 2026 22:03:09 +0800
Subject: [PATCH] feat: 增加OCR测试，车辆
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 219 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 179 insertions(+), 40 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 461aae1..b0141f1 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
@@ -252,24 +252,29 @@
* @return 缁撴灉
*/
@Override
- @Transactional
- public int insertSysTask(TaskCreateVO createVO) {
+ public Long insertSysTask(TaskCreateVO createVO) {
+ // 鑾峰彇褰撳墠鐢ㄦ埛鍚嶅拰鐢ㄦ埛ID
String username = SecurityUtils.getUsername();
Long userId = SecurityUtils.getUserId();
+ // 鏍￠獙鐢ㄦ埛ID鏄惁涓虹┖鎴栦负0
if(userId==null || userId==0){
log.error("insertSysTask 鐢ㄦ埛ID涓虹┖ userName:{}",username);
- return 0;
+ return 0L;
}
SysTask task = new SysTask();
+ // 鍒涘缓鏂扮殑浠诲姟瀵硅薄
task.setTaskCode(generateTaskCode());
- task.setTaskType(createVO.getTaskType());
- task.setTaskStatus(TaskStatus.PENDING.getCode());
- task.setTaskDescription(createVO.getTaskDescription());
- task.setPlannedStartTime(createVO.getPlannedStartTime());
- task.setPlannedEndTime(createVO.getPlannedEndTime());
- task.setAssigneeId(createVO.getAssigneeId());
+ // 璁剧疆浠诲姟鍩烘湰淇℃伅
+ task.setTaskType(createVO.getTaskType()); // 鐢熸垚浠诲姟缂栫爜
+ task.setTaskStatus(TaskStatus.PENDING.getCode()); // 璁剧疆浠诲姟绫诲瀷
+ task.setTaskDescription(createVO.getTaskDescription()); // 璁剧疆浠诲姟鐘舵�佷负寰呭鐞�
+ task.setPlannedStartTime(createVO.getPlannedStartTime()); // 璁剧疆浠诲姟鎻忚堪
+ task.setPlannedEndTime(createVO.getPlannedEndTime()); // 璁剧疆璁″垝寮�濮嬫椂闂�
+ task.setAssigneeId(createVO.getAssigneeId()); // 璁剧疆璁″垝缁撴潫鏃堕棿
+ // 璁剧疆鎸囨淳浜篒D
task.setCreatorId(userId);
+ // 璁剧疆鍒涘缓浜轰俊鎭�
// 浼樺厛浣跨敤鍓嶇浼犲叆鐨勯儴闂↖D锛屽鏋滄病鏈夊垯浣跨敤褰撳墠鐢ㄦ埛鐨勯儴闂↖D
task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId());
task.setCreateBy(username);
@@ -342,7 +347,7 @@
}).start();
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
/**
@@ -356,7 +361,7 @@
* @return 缁撴灉
*/
@Override
- public int insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
+ public Long 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());
@@ -388,8 +393,8 @@
if (createVO.getTransferTime() != null) {
task.setPlannedStartTime(createVO.getTransferTime());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
if (createVO.getPlannedStartTime() != null) {
task.setPlannedStartTime(createVO.getPlannedStartTime());
@@ -400,9 +405,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
// 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
autoFillMissingGpsCoordinates(task);
@@ -452,7 +455,7 @@
this.sendEmeryTaskProcess(task, dispatchOrderId);
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
@@ -503,11 +506,8 @@
// 璁剧疆棰勮璺濈
- if (updateVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(updateVO.getEstimatedDistance());
- } else if (updateVO.getDistance() != null) {
- // 鍏煎鎬ユ晳杞繍瀛楁
- task.setEstimatedDistance(updateVO.getDistance());
+ if (updateVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(updateVO.getTransferDistance());
}
// 濡傛灉鏇存柊浜嗛儴闂↖D
@@ -812,7 +812,7 @@
taskEmergency.setUpdateTime(DateUtils.getNowDate());
Boolean hasEmergencyInfo = updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null
- || updateVO.getPrice() != null || updateVO.getDistance() != null;
+ || updateVO.getPrice() != null || updateVO.getTransferDistance() != null;
// Boolean isHeadPush=isTaskHeaderPush(task.getCreatorId(),task.getDeptId());
// updateVO.setFromHQ2_is(isHeadPush?"1":"0");
@@ -855,7 +855,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteSysTaskByTaskIds(Long[] taskIds) {
int result = 0;
for (Long taskId : taskIds) {
@@ -876,7 +876,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignTask(Long taskId, Long assigneeId, String remark) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task == null) {
@@ -928,6 +928,67 @@
@Override
public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
+ }
+
+ /**
+ * 寮哄埗瀹屾垚浠诲姟锛堟寚瀹氬疄闄呭紑濮嬫椂闂村拰缁撴潫鏃堕棿锛�
+ *
+ * @param task 浠诲姟淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public int forceCompleteTask(SysTask task) {
+ if (task == null || task.getTaskId() == null) {
+ throw new RuntimeException("浠诲姟淇℃伅涓嶈兘涓虹┖");
+ }
+
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(task.getTaskId());
+ if (oldTask == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鏍￠獙寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ if (task.getActualStartTime() == null || task.getActualEndTime() == null) {
+ throw new RuntimeException("瀹為檯寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓虹┖");
+ }
+
+ if (task.getActualStartTime().after(task.getActualEndTime())) {
+ throw new RuntimeException("缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂�");
+ }
+
+ // 璁板綍鏃х姸鎬�
+ String oldStatus = oldTask.getTaskStatus();
+ TaskStatus oldTaskStatus = TaskStatus.getByCode(oldStatus);
+
+ // 鏇存柊浠诲姟
+ int result = sysTaskMapper.updateTaskStatus(task);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(task.getTaskId(), "FORCE_COMPLETE", "寮哄埗瀹屾垚浠诲姟",
+ oldStatus, task.getTaskStatus(),
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+
+ // 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
+ TaskStatus newTaskStatus = TaskStatus.getByCode(task.getTaskStatus());
+ eventPublisher.publishEvent(new TaskStatusChangedEvent(
+ this,
+ task.getTaskId(),
+ oldTask.getTaskCode(),
+ oldStatus,
+ task.getTaskStatus(),
+ oldTaskStatus != null ? oldTaskStatus.getInfo() : "鏈煡",
+ newTaskStatus != null ? newTaskStatus.getInfo() : "鏈煡",
+ null, // assigneeIds
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUserId(),
+ null, // longitude
+ null, // latitude
+ null // address
+ ));
+ }
+
+ return result;
}
/**
@@ -1016,6 +1077,71 @@
}
/**
+ * 淇濆瓨浠诲姟鍙栨秷淇℃伅锛堜粎闄愯浆杩愪换鍔★級
+ *
+ * @param taskId 浠诲姟ID
+ * @param cancelReason 鍙栨秷鍘熷洜锛堟暟鎹瓧鍏竧ask_cancel_reason鐨剉alue锛�
+ * @return 缁撴灉
+ */
+ @Override
+ public int saveCancelInfo(Long taskId, String cancelReason) {
+ // 鑾峰彇浠诲姟淇℃伅
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙湁杞繍浠诲姟鎵嶄繚瀛樺彇娑堜俊鎭�
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return 0;
+ }
+
+ // 鑾峰彇杞繍浠诲姟鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return 0;
+ }
+
+ // 璁剧疆鍙栨秷淇℃伅
+ emergency.setCancelReason(cancelReason);
+ emergency.setCancelBy(SecurityUtils.getNickName());
+ emergency.setCancelTime(DateUtils.getNowDate());
+ emergency.setUpdateBy(SecurityUtils.getUsername());
+ emergency.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊鏁版嵁搴�
+ return sysTaskEmergencyMapper.updateSysTaskEmergency(emergency);
+ }
+
+ @Override
+ public int saveCancel(Long taskId, String cancelReason, String cancelBy,Date cancelTime) {
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙湁杞繍浠诲姟鎵嶄繚瀛樺彇娑堜俊鎭�
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return 0;
+ }
+
+ // 鑾峰彇杞繍浠诲姟鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return 0;
+ }
+
+ // 璁剧疆鍙栨秷淇℃伅
+ emergency.setCancelReason(cancelReason);
+ emergency.setCancelBy(cancelBy);
+ emergency.setCancelTime(cancelTime);
+ emergency.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊鏁版嵁搴�
+ return sysTaskEmergencyMapper.updateSysTaskEmergency(emergency);
+ }
+
+ /**
* 涓婁紶浠诲姟闄勪欢
*
* @param taskId 浠诲姟ID
@@ -1024,7 +1150,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
return sysTaskAttachmentService.uploadAttachment(taskId, file, category);
}
@@ -1039,7 +1165,7 @@
* @return 杩斿洖闄勪欢ID
*/
@Override
- @Transactional
+
public Long uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category) {
return sysTaskAttachmentService.uploadAttachmentFromWechat(taskId, accessToken, mediaId, category);
}
@@ -1052,7 +1178,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteAttachment(Long attachmentId) {
return sysTaskAttachmentService.deleteAttachment(attachmentId);
}
@@ -1082,7 +1208,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignVehicleToTask(Long taskId, Long vehicleId, String remark,Long userId,String userName) {
int result = sysTaskVehicleService.assignVehicleToTask(taskId, vehicleId, remark, userId, userName);
@@ -1104,7 +1230,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
int result = sysTaskVehicleService.unassignVehicleFromTask(taskId, vehicleId);
@@ -1127,7 +1253,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark,Long userId,String userName) {
int result = sysTaskVehicleService.assignMultipleVehiclesToTask(taskId, vehicleIds, remark, userId, userName);
@@ -1420,8 +1546,8 @@
if (createVO.getDestinationLatitude() != null) {
task.setDestinationLatitude(createVO.getDestinationLatitude());
}
- if (createVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(createVO.getEstimatedDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
}
@@ -1436,8 +1562,8 @@
if (createVO.getTransferTime() != null) {
task.setPlannedStartTime(createVO.getTransferTime());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
// 璁剧疆绂忕杞︾壒瀹氫俊鎭�
@@ -1450,9 +1576,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
}
/**
@@ -1637,7 +1761,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult setAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.setAssigneeReady(taskId, userId);
}
@@ -1650,9 +1774,24 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
+
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹂噸澶嶏紙鏍规嵁鑱旂郴浜虹數璇濆拰鍒涘缓鏃ユ湡锛�
+ *
+ * @param phone 鑱旂郴浜虹數璇�
+ * @param createDate 浠诲姟鍒涘缓鏃ユ湡锛堟牸寮忥細YYYY-MM-DD锛�
+ * @return true-瀛樺湪閲嶅锛宖alse-涓嶉噸澶�
+ */
+ @Override
+ public boolean checkTaskDuplicate(String phone, String createDate) {
+ int count = sysTaskMapper.countTaskByPhoneAndDate(phone, createDate);
+ return count > 0;
+ }
+
+
}
--
Gitblit v1.9.1