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 | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 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 51f3800..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,14 +252,14 @@
* @return 缁撴灉
*/
@Override
- 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();
// 鍒涘缓鏂扮殑浠诲姟瀵硅薄
@@ -347,7 +347,7 @@
}).start();
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
/**
@@ -361,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());
@@ -455,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){
@@ -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;
}
/**
@@ -1089,7 +1150,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
return sysTaskAttachmentService.uploadAttachment(taskId, file, category);
}
@@ -1104,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);
}
@@ -1117,7 +1178,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteAttachment(Long attachmentId) {
return sysTaskAttachmentService.deleteAttachment(attachmentId);
}
@@ -1147,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);
@@ -1169,7 +1230,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
int result = sysTaskVehicleService.unassignVehicleFromTask(taskId, vehicleId);
@@ -1192,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);
@@ -1700,7 +1761,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult setAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.setAssigneeReady(taskId, userId);
}
@@ -1713,7 +1774,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
--
Gitblit v1.9.1