From ba0e15af1f11fb9e2a0c0fc5eabfec4625c8377a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 十一月 2024 09:54:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 71de5e5..ab6bfab 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -26,7 +25,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -67,17 +65,27 @@
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("agv0001","sta0001");
- String sta = map.get("sta").toString();
- ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
- getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
- String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
- if ("SUCCESS".equals(request)) {
- return R.ok();
+ if (Cools.isEmpty(map.get("sta"))) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ } else if (Cools.isEmpty(map.get("inSta"))) {
+ return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
- return R.error();
+// HashMap<String, String> map1 = new HashMap<>();
+// map1.put("agv0001","sta0001");
+// String sta = map.get("sta").toString();
+//
+// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
+// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
+// if ("SUCCESS".equals(request)) {
+// return R.ok();
+// }
+ String sta = (String) map.get("sta"); // 鏆傚瓨浣�
+ String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
+
+ return mobileService.inLocCallAgv(sta, inSta);
+
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
--
Gitblit v1.9.1