From 14dfd8520004949924757919f505ed1805f62199 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 11:58:25 +0800
Subject: [PATCH] #回调日志
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index bb077b8..6b87a01 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -65,18 +65,12 @@
@AppAuth(memo = "ESS浠诲姟鍥炶皟")
public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){
- apiLogService.save(
- "ESS浠诲姟鍥炶皟",
- "/phyzwms/agv/task/event/status",
- null,
- null,
- JSON.toJSONString(JSONObject.toJSONString(param)),
- null,
- true
- );
+
//save api log (appkey 鍚庣画娣诲姞)
+
+ R r = new R(0, "鎴愬姛");
AppAuthUtil.auth("",param, request);
int wrkNo = Integer.parseInt(param.getTaskCode());
@@ -87,7 +81,9 @@
if(Cools.isEmpty(agvWrkMast)){
agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getPodCode()));
if (Cools.isEmpty(agvWrkMast)){
- return R.error("浠诲姟缂栧彿閿欒");
+ r = R.error("浠诲姟缂栧彿閿欒");
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
}
}
if (agvWrkMast.getIoType().equals(121)){
@@ -95,20 +91,29 @@
if (agvWrkMast.getWrkSts().equals(12L)){
WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo));
if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){
- return R.error("浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$());
+ r = R.error("浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$());
+ logPost(param,"浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$()+JSONObject.toJSONString(r),false);
+ return r;
} else {
wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
wrkMastExecuteService.updateById(wrkMastExecute);
}
}else {
- return R.error("浠诲姟寮傚父");
+ r = R.error("浠诲姟寮傚父");
+ logPost(param,JSONObject.toJSONString(r),false);
+
+ return r;
}
}catch (Exception e){
- return R.error(""+e.getMessage());
+ r = R.error(""+e.getMessage());
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
}
}else {
if(agvWrkMast.getWrkSts() >= 205){
- return R.error("褰撳墠浠诲姟宸插畬鎴�");
+ r = R.error("褰撳墠浠诲姟宸插畬鎴�");
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
}
AgvTask agvTask = AgvTask.valueOf(param.getMethod());
@@ -117,16 +122,23 @@
Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class);
method.invoke(agvTask,agvWrkMast,param);
} catch (NoSuchMethodException e) {
- return R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
+ r = R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
} catch (InvocationTargetException e) {
log.error(e.getMessage());
- return R.error();
+ r = R.error(""+e.getMessage());
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
} catch (IllegalAccessException e) {
log.error(e.getMessage());
- return R.error();
+ r = R.error(""+e.getMessage());
+ logPost(param,JSONObject.toJSONString(r),false);
+ return r;
}
}
- return new R(0, "鎴愬姛");
+ logPost(param,JSONObject.toJSONString(r),true);
+ return r;
}
@PostMapping("/conveyor/loadContainerFinish ")
@@ -135,6 +147,18 @@
return R.ok();
}
+
+ private void logPost( AgvTaskCallBackParam param,String response,boolean success){
+ apiLogService.save(
+ "ESS浠诲姟鍥炶皟",
+ "/phyzwms/agv/task/event/status",
+ null,
+ null,
+ JSON.toJSONString(JSONObject.toJSONString(param)),
+ response,
+ success
+ );
+ }
}
enum AgvTask{
--
Gitblit v1.9.1