From 7964ad29dc282c472a56945b857343105463fd0a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 31 十月 2024 13:40:05 +0800
Subject: [PATCH] 入库呼叫agv取货
---
src/main/java/com/zy/common/constant/ApiInterfaceConstant.java | 16 ++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 61 ++++++++++++++++++++++++++----
2 files changed, 68 insertions(+), 9 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..aafdc94 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;
@@ -14,6 +13,7 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
@@ -26,7 +26,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -67,16 +66,60 @@
@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();
+// 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 inSts = "1040"; // 鍏ュ簱绔欑偣
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();
+ forwardAGVTaskParam.setCtnrTyp("2");
+ forwardAGVTaskParam.setPriority("1");
+ List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(sta,"05"));
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(inSts,"05"));
+ forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+ String body = JSON.toJSONString(forwardAGVTaskParam);
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP+ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "璇锋眰浠撳偍MES鐩樼偣鍗曚笂鎶ユ帴鍙�",
+// MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_SB_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(collect),
+// response,
+// success
+// );
+ } catch (Exception e) { log.error("", e); }
}
+
return R.error();
}
diff --git a/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java b/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java
new file mode 100644
index 0000000..595ccd3
--- /dev/null
+++ b/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java
@@ -0,0 +1,16 @@
+package com.zy.common.constant;
+
+/**
+ * @author pang.jiabao
+ * @description 璋冪敤澶栭儴API鍦板潃甯搁噺
+ * @createDate 2024/10/31 13:29
+ */
+public class ApiInterfaceConstant {
+
+ // AGV IP鍦板潃
+ public static final String AGV_IP = "10.0.100.110:8182";
+
+ // 鍏ュ簱鍛煎彨AGV鍙栬揣
+ public static final String AGV_CALL_IN_PATH = "/rcms/services/rest/hikRpcService/genAgvSchedulingTask";
+
+}
--
Gitblit v1.9.1