From 45430b88dab1451ecff39236dab01d5668b5b9c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:22 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 74 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index eedb8af..ea8eabb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -6,17 +6,17 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.TaskItem;
-import com.vincent.rsf.server.manager.service.TaskItemService;
-import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.enums.LocStsType;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,9 +31,13 @@
@Autowired
private TaskService taskService;
-
@Autowired
private TaskItemService taskItemService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocService locService;
+
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
@@ -95,18 +99,8 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, ids).in(Task::getTaskStatus, longs));
- if (tasks.isEmpty()) {
- throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�");
- }
- if (!taskService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
- }
- if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, ids))) {
- return R.error("Details delete Failed");
- }
- return R.ok("Delete Success").add(ids);
+ return taskService.removeTask(ids);
+// return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -138,23 +132,39 @@
}
List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
-// if (tasks.isEmpty()) {
-// throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
-// }
- taskService.completeTask(tasks);
- return R.ok();
- }
-
- @PreAuthorize("hasAuthority('manager:task:update')")
- @ApiOperation("鍙栨秷浠诲姟")
- @PostMapping("/task/cancel/{id}")
- public R cancelTask(@PathVariable String id) {
- if (Objects.isNull(id)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ for (Task task : tasks) {
+ task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
}
- return R.ok();
+ if (!taskService.updateBatchById(tasks)) {
+ return R.error("瀹屾垚浠诲姟澶辫触");
+ }
+
+ return R.ok("瀹屾垚浠诲姟鎴愬姛");
}
+ /**
+ * 鎷ｆ枡鍑哄簱
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鎷ｆ枡鍑哄簱")
+ @PostMapping("/task/pick/{id}")
+ public R pickTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return taskService.pickTask(id);
+ }
+
+// @PreAuthorize("hasAuthority('manager:task:update')")
+// @ApiOperation("鍙栨秷浠诲姟")
+// @PostMapping("/task/cancel/{id}")
+// public R cancelTask(@PathVariable String id) {
+// if (Objects.isNull(id)) {
+// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+// }
+// return R.ok();
+// }
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("浠诲姟鍑哄簱缃《")
--
Gitblit v1.9.1