From 46d68076bfa7b706549e0420dfe09314024e3696 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 21:02:39 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/asrs/controller/AgvController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvController.java b/src/main/java/com/zy/asrs/controller/AgvController.java
index d20a6bc..7e5bf48 100644
--- a/src/main/java/com/zy/asrs/controller/AgvController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvController.java
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
+import com.zy.core.thread.SiemensDevpThread3;
import lombok.extern.slf4j.Slf4j;
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.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -22,14 +24,26 @@
@PostMapping("/container/release")
public R containerRelease(@RequestBody JSONObject jsonObject){
- System.out.println(jsonObject.toString());
- HashMap<String, String> map = new HashMap<>();
- map.put("allow","true");
+ HashMap<String, Boolean> currentStationInfoMap = SiemensDevpThread3.currentStationInfoMap;
+ String slotCode = jsonObject.get("slotCode").toString();
+
+ Map<String,String> map = new HashMap<>();
+ if(!currentStationInfoMap.get(slotCode)){
+ map.put("allow","true");
+ }else {
+ map.put("allow","false");
+ }
+
R r = new R(0, "");
return r.add(map);
- //return R.ok();
+ }
+
+ @PostMapping("/container/completed")
+ public R containerCompleted(@RequestBody JSONObject jsonObject){
+
+ return R.ok();
}
}
--
Gitblit v1.9.1