From 3d0432367713440506f9ec105e95a12bdb001936 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 16:47:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 157 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 119 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6806b2b..c5825f2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,27 +1,32 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.*;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@RestController
@@ -38,10 +43,39 @@
private TaskWrkController taskWrkController;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ @Autowired
+ private StaDescService staDescService;
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+
+ private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ //agv浠诲姟瀹屾垚
+ @PostMapping("/toAgvTaskOver")
+ @AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
+ public R getAgvTaskOver(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getWharfCode())){
+ return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStatus())){
+ return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
+ }
+ openService.getAgvTaskOver(param);
+ return R.ok();
+ }
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
@@ -106,9 +140,12 @@
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
@PostMapping("/targetWharfApply")
+ @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
public R targetWharfApply(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
+ HttpServletRequest request) throws IOException {
+ auth(appkey,param,request);
+
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -120,19 +157,25 @@
} else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
-
- if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡璇㈠埌浠诲姟锛屼换鍔″彿锛�"+param.getTaskNo());
- }
- return R.ok(taskWrk.getStartPoint());
+ R r = openService.AgvToWCSToWms(param);
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
+ return r;
}
//AGV璇锋眰鍔ㄤ綔鎺ュ彛
@PostMapping("/agvTaskRequest")
+ @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
public R agvTaskRequest(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getRequestType())){
@@ -141,17 +184,46 @@
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
- try{
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
- if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
- return R.ok();
- }else {
- return R.error();
- }
- }catch (Exception e){
- log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
+ 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);
+ map.put("H-1102",300);map.put("H-1101",305);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_desc", param.getWharfCode()));
+
+ if (Cools.isEmpty(staDesc)){
return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
}
+ //BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+ BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+ if (basDevp.getAutoing().equals("Y")){
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,R.ok().toString()
+ ,true
+ );
+ return R.ok();
+ }else {
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+ ,true
+ );
+ return R.error("绔欑偣鐘舵�佷笉鍙叆");
+ }
+
+
+
+
}
@@ -161,9 +233,10 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
+ auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
- try {
+
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -182,29 +255,35 @@
if (Cools.isEmpty(param.getEmptyContainer())){
return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
}
-// if (Cools.isEmpty(param.getTaskTunnel())){
-// return R.error("浠诲姟宸烽亾涓虹┖锛�");
-// }
-// if (Cools.isEmpty(param.getGroupNo())){
-// return R.error("浠诲姟缁勪负绌猴紒");
-// }
-// if (Cools.isEmpty(param.getTaskSerialNo())){
-// return R.error("浠诲姟鎵ц椤哄簭涓虹┖锛�");
-// }
if (Cools.isEmpty(param.getTargetWharf())){
return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
}
+ StaDesc staDesc = new StaDesc();
+ if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).lt("crn_stn", 200));
+ }else {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).ge("crn_stn", 200));
+ }
+ param.setTargetLocationCode(staDesc.getStnNo().toString());
- openService.taskCreate(new taskCreateParam(param));
- params1.add(param);
-// return R.ok(param);
- }catch (Exception e){
- String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
- return R.error("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�!"+ errorMsg);
- }
+ R r = openService.taskCreate(new taskCreateParam(param));
+
+ apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
+ return r;
+
}
- return R.ok(params1);
+
+ return null;
}
//浠诲姟鍙栨秷鎺ュ彛
@@ -267,4 +346,6 @@
}
}
+
+
}
--
Gitblit v1.9.1