From ffe47d904591be8cae513a75ac899dbf720a6e71 Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期六, 07 十月 2023 15:25:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
index 7d68b60..ba98510 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.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;
@@ -17,7 +18,6 @@
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.utils.MesSyncUtil;
-import com.zy.common.constant.MesConstant;
 import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,12 +28,13 @@
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
 public class MesPakinHandler extends AbstractHandler<String> {
     @Value("${mes.pakin.url}")
-    private String url;
+    private String uri;
 
     @Value("${mes.pakin.path}")
     private String path;
@@ -56,11 +57,11 @@
     @Transactional
     public ReturnT<String> start() {
         boolean success = true;
-        log.info("url:" + url + path);
+        log.info("url:" + uri + path);
         JSONObject jsonObject = null;
-        String respone;
         try {
-            jsonObject = doGetJsonData();
+            jsonObject = doPostJsonData();
+            log.info("MesPakinHandler jsonObject:" + jsonObject);
         } catch (IOException e) {
             success = false;
             e.printStackTrace();
@@ -69,11 +70,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;
             log.error("璇锋眰mes鎺ュ彛鍝嶅簲閿欒锛屽搷搴旂爜涓�: " + code);
@@ -88,7 +95,7 @@
     private void saveApiLog(String response, boolean success){
         apiLogService.save(
                 "鐢熸垚鍏ュ簱鍗曟嵁",
-                url + path,
+                uri + path,
                 null,
                 "127.0.0.1",
                 null,
@@ -98,15 +105,20 @@
     }
 
     /*
-    鍙戣捣涓�涓猟oGet璇锋眰
+    鍙戣捣涓�涓姹傛潵鑾峰彇鏈幏鍙栬繃鐨勫崟鎹俊鎭�
      */
-    private JSONObject doGetJsonData() throws IOException {
+    private JSONObject doPostJsonData() throws IOException {
+
+        Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+        //鑾峰彇鏈幏鍙栬繃鐨勬墍鏈夊崟鎹�
+        requestParamMap.put("type",0);
+
         return JSON.parseObject( new HttpHandler.Builder()
-                .setUri(url)
+                .setUri(uri)
                 .setPath(path)
-                .setParams(MesSyncUtil.getRequestParamMap())
+                .setParams(requestParamMap)
                 .build()
-                .doGet());
+                .doPostWithParam());
     }
 
     /*
@@ -166,6 +178,8 @@
         o.setOrderTime(jsonData.getString("orderTime"));
         //鍗曟嵁绫诲瀷
         DocType docType = docTypeService.selectOrAdd(jsonData.getString("orderType"), Boolean.TRUE);
+        //鐗╂祦鍚嶇О -- 鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
+        o.setShipName(jsonData.getString("storage"));
         o.setDocType(docType.getDocId());
         o.setCreateTime(new Date());
         o.setUpdateTime(new Date());

--
Gitblit v1.9.1