From 20e8b29ab26083c26b755d4c1087af2116d22262 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 09:55:02 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能
---
src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
index 2e819a7..e8465b3 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
@@ -27,12 +27,13 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
public class MesPakinHandler extends AbstractHandler<String> {
- @Value("${mes.pakin.url}")
- private String url;
+ @Value("${mes.pakin.uri}")
+ private String uri;
@Value("${mes.pakin.path}")
private String path;
@@ -55,10 +56,10 @@
@Transactional
public ReturnT<String> start() {
boolean success = true;
- log.info("url:" + url + path);
+ log.info("url:" + uri + path);
JSONObject jsonObject = null;
try {
- jsonObject = doGetJsonData();
+ jsonObject = doPostJsonData();
} catch (IOException e) {
success = false;
e.printStackTrace();
@@ -86,7 +87,7 @@
private void saveApiLog(String response, boolean success){
apiLogService.save(
"鐢熸垚鍏ュ簱鍗曟嵁",
- url + path,
+ uri + path,
null,
"127.0.0.1",
null,
@@ -96,15 +97,20 @@
}
/*
- 鍙戣捣涓�涓猟oGet璇锋眰
+ 鍙戣捣涓�涓姹傛潵鑾峰彇鏈幏鍙栬繃鐨勫崟鎹俊鎭�
*/
- private JSONObject doGetJsonData() throws IOException {
+ private JSONObject doPostJsonData() throws IOException {
+
+ Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+ //鑾峰彇鏈幏鍙栬繃鐨勬墍鏈夊崟鎹�
+ requestParamMap.put("type",0);
+
return JSON.parseObject( new HttpHandler.Builder()
- .setUri(url)
+ .setUri(uri)
.setPath(path)
- .setParams(MesSyncUtil.getRequestParamMap())
+ .setParams(requestParamMap)
.build()
- .doGet());
+ .doPostWithParam());
}
/*
@@ -164,8 +170,8 @@
o.setOrderTime(jsonData.getString("orderTime"));
//鍗曟嵁绫诲瀷
DocType docType = docTypeService.selectOrAdd(jsonData.getString("orderType"), Boolean.TRUE);
- //鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
- jsonData.getString("storage");
+ //鐗╂祦鍚嶇О -- 鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
+ o.setShipName(jsonData.getString("storage"));
o.setDocType(docType.getDocId());
o.setCreateTime(new Date());
o.setUpdateTime(new Date());
--
Gitblit v1.9.1