From af17595ea094b162d3b90279f140cbdb3da1c52b Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期六, 07 十月 2023 15:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxlktasrs' into sxlktasrs
---
src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
index 24bb061..0d63af0 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
@@ -32,7 +33,7 @@
@Slf4j
@Service
public class MesPakoutHandler extends AbstractHandler<String> {
- @Value("${mes.pakout.uri}")
+ @Value("${mes.pakout.url}")
private String uri;
@Value("${mes.pakout.path}")
@@ -68,10 +69,17 @@
int code = jsonObject.getInteger("code");
if(code == 200){
- JSONObject jsonData = jsonObject.getJSONObject("data");
- String orderNo = jsonData.getString("orderNo");
- Order o = insertOrder(jsonData,orderNo);
- insertOrUpdateOrderDetl(jsonData, o);
+ if(!Cools.isEmpty(jsonObject.getString("data")) && jsonObject.getString("data").length()>2){
+
+ JSONArray jsonArray = jsonObject.getJSONArray("data");
+ List<JSONObject> jsonDataList = jsonArray.toJavaList(JSONObject.class);
+
+ jsonDataList.forEach(data -> {
+ String orderNo = data.getString("orderNo");
+ Order o = insertOrder(data,orderNo);
+ insertOrUpdateOrderDetl(data, o);
+ });
+ }
}else {
success = false;
@@ -86,7 +94,7 @@
*/
private void saveApiLog(String response, boolean success){
apiLogService.save(
- "鐢熸垚鍏ュ簱鍗曟嵁",
+ "鐢熸垚鍑哄簱鍗曟嵁",
uri + path,
null,
"127.0.0.1",
--
Gitblit v1.9.1