From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b77707d..2ccb076 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
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;
@@ -14,7 +13,6 @@
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 com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -28,6 +26,8 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -80,8 +80,16 @@
if (Cools.isEmpty(param.getStatus())){
return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
}
- openService.getAgvTaskOver(param);
- return R.ok();
+ R agvTaskOver = openService.getAgvTaskOver(param);
+ apiLogService.save("AGV璇锋眰浠诲姟瀹屾垚"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,agvTaskOver.toString()
+ ,true
+ );
+ return agvTaskOver;
}
//鍒涘缓浠诲姟
@@ -152,6 +160,7 @@
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) throws IOException {
auth(appkey,param,request);
+ log.warn("璇锋眰鍏ュ簱鐮佸ご鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
@@ -161,9 +170,10 @@
return R.error("鎵樼洏缂栫爜涓虹┖锛�");
} else if (Cools.isEmpty(param.getWharfSource())){
return R.error("婧愮爜澶翠负绌猴紒");
- } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
- return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
+// else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
+// return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
+// }
R r = openService.AgvToWCSToWms(param);
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
@@ -173,6 +183,7 @@
,r.toString()
,true
);
+ log.warn("璇锋眰鍏ュ簱鐮佸ご瀹屾垚鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
return r;
}
@@ -230,7 +241,7 @@
,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
,true
);
- return R.error("绔欑偣鐘舵�佷笉鍙叆");
+ return R.error("绔欑偣鐘舵�佷笉鍙叆,鑷姩淇″彿:"+basDevp.getAutoing()+";鍙叆淇″彿:"+basDevp.getInEnable()+";鍙嚭淇″彿:"+basDevp.getOutEnable());
}
@@ -245,6 +256,7 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
+ log.warn("鏀跺埌涓嬪彂浠诲姟鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
@@ -308,7 +320,7 @@
}
-
+ log.warn("涓嬪彂浠诲姟瑙ｆ瀽瀹屾垚鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
return R.ok();
}
--
Gitblit v1.9.1