From ff7f41f5d6c99bff4a1d85a5b3342eec5a8fee0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 07 十一月 2024 08:52:34 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
index b8be782..c4c6da2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
@@ -3,15 +3,14 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.domain.TaskPosDto;
+import com.zy.acs.manager.manager.entity.Action;
+import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.service.MissionService;
import com.zy.acs.manager.manager.service.SegmentService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +31,15 @@
@PreAuthorize("hasAuthority('manager:mission:list')")
@PostMapping("/mission/page")
public R page(@RequestBody Map<String, Object> map) {
- return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList()));
+ Long agvId = null;
+ if (null != map.get("agvId")) {
+ agvId = Long.parseLong(String.valueOf(map.get("agvId")));
+ }
+ String groupNo = null;
+ if (!Cools.isEmpty(map.get("groupNo"))) {
+ groupNo = String.valueOf(map.get("groupNo"));
+ }
+ return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList(agvId, groupNo)));
}
@PreAuthorize("hasAuthority('manager:mission:list')")
@@ -45,4 +52,17 @@
return R.ok().add(list);
}
+ @PreAuthorize("hasAuthority('manager:mission:list')")
+ @GetMapping("/mission/{id}")
+ public R get(@PathVariable("id") Long id) {
+ Segment segment = segmentService.getById(id);
+ return R.ok().add(missionService.generateVoMoreInfo(segment.getGroupId()));
+ }
+
+ @PreAuthorize("hasAuthority('manager:mission:update')")
+ @PostMapping("/mission/resend")
+ public R resend(@RequestBody List<Action> actionList) {
+ return missionService.resend(actionList) ? R.ok("Resend Success") : R.error("Resend Fail");
+ }
+
}
--
Gitblit v1.9.1