From 1b7f9f109e5d40f22fc061b93444409446d4be4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 23:17:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/ControllerResAdvice.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 20 ++++++++++++++++++--
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 22 ++++++++++++++++++++--
3 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 58d6f25..b546e16 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -56,6 +56,8 @@
private OpenService openService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private ApiLogService apiLogService;
@Override
@Transactional
@@ -289,7 +291,8 @@
for (DetlDto detlDto : detlDtos) {
mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getMatnr(), detlDto.getAnfme()));
}
- String response;
+ String response = "";
+ boolean success = false;
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
@@ -299,7 +302,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛�");
+ success = true;
} else if (jsonObject.getInteger("code").equals(500)) {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
throw new CoolException(jsonObject.getString("msg"));
@@ -310,6 +313,19 @@
} catch (Exception e) {
log.error("fail", e);
throw new CoolException(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎵撳寘涓嬬嚎甯墭涓婃姤",
+// MesConstant.URL + MesConstant.PACK_DOWN_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(mesCombParam),
+// response,
+// success
+// );
+ } catch (Exception e) { log.error("", e); }
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index e611ccf..ea00821 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
@@ -35,6 +36,8 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private ApiLogService apiLogService;
@Transactional
public ReturnT<String> start(Order order) {
@@ -47,9 +50,10 @@
for (OrderDetl orderDetl : orderDetls) {
pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr(), orderDetl.getAnfme()));
}
-
+ String response = "";
+ boolean success = false;
try {
- String response = new HttpHandler.Builder()
+ response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
.setPath(MesConstant.PAKIN_URL)
.setJson(JSON.toJSONString(pakinParam))
@@ -57,6 +61,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -69,6 +74,19 @@
log.error("fail", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎴愬搧搴撳叆搴撲笂鎶�",
+// MesConstant.URL + MesConstant.PAKIN_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(pakinParam),
+// response,
+// success
+// );
+ } catch (Exception e) { log.error("", e); }
}
return SUCCESS;
}
diff --git a/src/main/java/com/zy/common/config/ControllerResAdvice.java b/src/main/java/com/zy/common/config/ControllerResAdvice.java
index 08b22d1..1dba085 100644
--- a/src/main/java/com/zy/common/config/ControllerResAdvice.java
+++ b/src/main/java/com/zy/common/config/ControllerResAdvice.java
@@ -51,7 +51,7 @@
IpTools.gainRealIp(request),
JSON.toJSONString(request.getParameterMap()),
JSON.toJSONString(o),
- Boolean.TRUE
+ String.valueOf(((R) o).get("code")).equalsIgnoreCase("200")
);
}
}
--
Gitblit v1.9.1