From 525cf3d9714352284b70c29f81fa73bff71cf683 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 14 七月 2023 08:11:55 +0800
Subject: [PATCH] 完善AGV相关功能
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 27d587c..2ee810a 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,13 +1,22 @@
package com.zy.asrs.controller;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvMobileService;
+import com.zy.asrs.service.AgvWorkService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -19,11 +28,16 @@
@Autowired
private AgvMobileService agvMobileService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvWorkService workService;
+
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- agvMobileService.comb(combParam, 1l);
- return R.ok("缁勬墭鎴愬姛");
+ String message = agvMobileService.comb(combParam, 1l);
+ return R.ok(message);
}
@PostMapping("/combBinging/auth")
@@ -34,9 +48,31 @@
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
+ @PostMapping("/getBasDevp/auth")
+ public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
+ String floor = map.get("floor").toString();
+ if("1".equals(floor) || "3".equals(floor)){
+ return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
+ }
+ return R.error("鍙傛暟閿欒");
+ }
+ @PostMapping("/pakin/auth")
+ public R pakin(@RequestBody Map<String,Object> map){
+ List<String> devNos = (List<String>) map.get("devNo");
+ List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ if (!"F".equals(agvBasDevp.getLocSts())) {
+ throw new CoolException("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱锛岃閲嶆柊閫夋嫨");
+ }
+ return agvBasDevp;
+ }).collect(Collectors.toList());
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
}
--
Gitblit v1.9.1