From dc9ebf79f7627c39dbbd58481139fda663878dfa Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 十一月 2023 08:30:51 +0800
Subject: [PATCH] #接口
---
src/main/java/com/zy/asrs/controller/OpenController.java | 13 +++++++++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 19 ++++++++++++-------
src/main/resources/application.yml | 2 +-
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3451eaf..316e934 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,6 +51,7 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ //agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
public R getAgvTaskOver(@RequestHeader String appkey,
@RequestBody TaskOverParam param,
@@ -166,12 +167,20 @@
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
+ Map<String,Integer> map = new HashMap<>();
+ map.put("J-1101",102);map.put("J-1102",101);
+ map.put("J-1103",106);map.put("J-1104",105);
+ map.put("J-1105",110);map.put("J-1106",109);
+ map.put("J-1107",114);map.put("J-1108",113);
+ map.put("J-1109",118);map.put("J-1110",117);
+ map.put("J-1111",122);map.put("J-1112",121);
+
try{
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
return R.ok();
}else {
- return R.error();
+ return R.error("绔欑偣鐘舵�佷笉鍙叆");
}
}catch (Exception e){
log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 2741292..6da4410 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -96,13 +96,18 @@
toWmsDTO.setApplyType("TUNNEL");
toWmsDTO.setWharfSource(null);
toWmsDTO.setCanInboundTunnels(list);
- String response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/inboundTaskApply")
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ return R.error("wms杩炴帴澶辫触"+e.getMessage());
+ }
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9341f83..1bd1127 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -49,7 +49,7 @@
# WMS绯荤粺ip
#url: 10.32.53.195:8080
# WMS绯荤粺ip
- url: 172.18.9.56:8080
+ url: w.informfengyun.com:58088/prod-api
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
inboundTaskApplyPath: api/InterFace/get_InterFace_TestStorage
# 浠诲姟鐘舵�佸弽棣堟帴鍙�
--
Gitblit v1.9.1