From 8018bc679c3a609b7c8537fcc1127f7e24d2cf8d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 02 一月 2024 17:00:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 215 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 156 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 764aa2a..cbf0609 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,11 +3,13 @@
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.*;
+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.*;
@@ -21,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +44,12 @@
private TaskWrkController taskWrkController;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private StaDescService staDescService;
@Value("${wms.url}")
private String wmsUrl;
@@ -50,6 +59,25 @@
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")
@@ -114,9 +142,12 @@
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
@PostMapping("/targetWharfApply")
+ @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
public R targetWharfApply(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) throws IOException {
+ auth(appkey,param,request);
+
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -128,39 +159,21 @@
} else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
- ToWmsDTO toWmsDTO = new ToWmsDTO();
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- List<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(4);
- //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
- toWmsDTO.setWarehouseId("1688469798893297665");
- toWmsDTO.setContainerCode(param.getContainerCode());
- toWmsDTO.setApplyType("TUNNEL");
- toWmsDTO.setCanInboundTunnels(list);
- String response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- //瑙ｆ瀽
- return R.ok(jsonObject.get("data"));
- }else {
- return R.error((String) jsonObject.get("msg"));
- }
-
-
-
+ 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) {
@@ -173,17 +186,51 @@
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);
- return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+ Map<String,Integer> map = new HashMap<>();
+ map.put("J-1102",102);map.put("J-1101",101);
+ map.put("J-1103",105);map.put("J-1104",106);
+ map.put("J-1105",109);map.put("J-1106",110);
+ map.put("J-1107",113);map.put("J-1108",114);
+ map.put("J-1109",117);map.put("J-1110",118);
+ map.put("J-1111",121);map.put("J-1112",122);
+ map.put("H-1102",300);map.put("H-1101",305);
+ map.put("G-1102",400);map.put("G-1101",405);
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("stn_desc", param.getWharfCode()));
+//
+// if (Cools.isEmpty(staDesc)){
+// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+// }
+ if (Cools.isEmpty(map.get(param.getWharfCode()))){
+ return R.error("鏈煡璇㈠埌绔欑偣");
}
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+ if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().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("绔欑偣鐘舵�佷笉鍙叆");
+ }
+
+
+
+
}
@@ -196,7 +243,7 @@
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())){
@@ -215,29 +262,49 @@
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杞﹂棿
+ if (!param.getTaskType().equals("YK")){
+ if (Cools.isEmpty(param.getTargetWharf())){
+ return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ }
}
- openService.taskCreate(new taskCreateParam(param));
+ 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("stn_no",200));
+ }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",param.getTaskTunnel())
+ .eq("type_no",2)
+ .lt("stn_no",400)
+ .gt("stn_no",200));
+ }else {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",param.getTaskTunnel())
+ .eq("type_no",2)
+ .lt("stn_no",500)
+ .ge("stn_no",400));
+ }
+ param.setTargetLocationCode(staDesc.getStnNo().toString());
- 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.ok(params1);
+
+ return R.ok();
}
//浠诲姟鍙栨秷鎺ュ彛
@@ -245,6 +312,7 @@
public R taskCancel(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -300,6 +368,35 @@
}
}
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/deviceStatus")
+ @Transactional
+ public R deviceStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (BasDevp basDevp:basDevps){
+ Map<String, Object> map = new HashMap<>();
+ map.put("devNo", basDevp.getDevNo());
+ map.put("devType", "杈撻�佺嚎");
+ map.put("devStatus", basDevp.getAutoing().equals("Y")? 1:0);
+ map.put("errorCode", 0);
+ map.put("errorMsg", "");
+ list.add(map);
+ }
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ Map<String, Object> map = new HashMap<>();
+ map.put("devNo", basCrnp.getCrnNo());
+ map.put("devType", "鍫嗗灈鏈�");
+ map.put("devStatus", basCrnp.getCrnSts());
+ map.put("errorCode", 0);
+ map.put("errorMsg", "");
+ list.add(map);
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.9.1