From e2ae6b57bb1398391be2050e85a729a7c8682f1f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 11:27:40 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能

---
 src/main/java/com/zy/asrs/task/MesPakoutScheduler.java       |   11 +----
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java       |    2 
 src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java |   18 ++++++--
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |    9 +++-
 src/main/java/com/zy/asrs/utils/MesSyncUtil.java             |   16 +++++++
 src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java  |   16 ++++++--
 src/main/resources/application.yml                           |    4 +-
 src/main/java/com/zy/asrs/task/MesPakinScheduler.java        |    3 +
 8 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/MesPakinScheduler.java b/src/main/java/com/zy/asrs/task/MesPakinScheduler.java
index 4daa36e..11901d6 100644
--- a/src/main/java/com/zy/asrs/task/MesPakinScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MesPakinScheduler.java
@@ -4,6 +4,7 @@
 import com.zy.asrs.task.handler.MesPakinHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
@@ -16,7 +17,7 @@
     @Autowired
     MesPakinHandler handler;
 
-    //@Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     private void execute() {
 
         ReturnT<String> result = null;
diff --git a/src/main/java/com/zy/asrs/task/MesPakoutScheduler.java b/src/main/java/com/zy/asrs/task/MesPakoutScheduler.java
index 0c37223..0c4fd8f 100644
--- a/src/main/java/com/zy/asrs/task/MesPakoutScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MesPakoutScheduler.java
@@ -4,9 +4,8 @@
 import com.zy.asrs.task.handler.MesPakoutHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import java.io.IOException;
 
 /**
  * 杞MES鎺ュ彛锛岀敓鎴愬嚭搴撳崟鎹�
@@ -18,15 +17,11 @@
     @Autowired
     MesPakoutHandler handler;
 
-    //@Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     private void execute() {
 
         ReturnT<String> result = null;
-        try {
-            result = handler.start();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        result = handler.start();
         if (!result.isSuccess()) {
             log.error("");
         }
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..1619b74 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -38,7 +38,7 @@
         }
     }
 
-//    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
         String erpReport = Parameter.get().getErpReport();
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 e8465b3..43bf259 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;
@@ -60,6 +61,7 @@
         JSONObject jsonObject = null;
         try {
             jsonObject = doPostJsonData();
+            log.info("MesPakinHandler jsonObject:" + jsonObject);
         } catch (IOException e) {
             success = false;
             e.printStackTrace();
@@ -68,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);
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..47b753a 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;
@@ -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",
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 0f716ab..68e76cd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -13,6 +13,7 @@
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MesSyncUtil;
 import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -185,9 +186,10 @@
             response = new HttpHandler.Builder()
                     .setUri(pakoutUri)
                     .setPath(pakoutPath)
+                    .setParams(MesSyncUtil.getRequestParamMap())
                     .setJson(JSON.toJSONString(requestMap))
                     .build()
-                    .doPost();
+                    .doPostWithParam();
             success = orderSettleUpdate(response,order);
         } catch (Exception e) {
             log.error("fail", e);
@@ -213,6 +215,7 @@
 
     private  ReturnT<String> orderPakinSync (Order order, String orderType, List<OrderDetl> orderDetls){
         Map<String,Object> requestMap = getRequestMap(order,orderType,orderDetls);
+        System.out.println("requestMap: " + requestMap);
 
         String response = "";
         boolean success = false;
@@ -221,9 +224,11 @@
             response = new HttpHandler.Builder()
                     .setUri(pakinUri)
                     .setPath(pakinPath)
+                    .setParams(MesSyncUtil.getRequestParamMap())
                     .setJson(JSON.toJSONString(requestMap))
                     .build()
-                    .doPost();
+                    .doPostWithParam();
+            System.out.println(response);
             success = orderSettleUpdate(response,order);
         } catch (Exception e) {
             log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/utils/MesSyncUtil.java b/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
index 749d259..7264960 100644
--- a/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
+++ b/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
@@ -1,5 +1,7 @@
 package com.zy.asrs.utils;
 
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.DigestUtils;
 
@@ -16,7 +18,7 @@
     public static Map<String,Object> getRequestParamMap(){
         Date date = new Date();
         String ts = date.getTime() + "";
-        String key = DigestUtils.md5DigestAsHex((appkey + ts).getBytes(StandardCharsets.UTF_8));
+        String key = DigestUtils.md5DigestAsHex(("SX3WMS20230725" + ts).getBytes(StandardCharsets.UTF_8));
         Map<String,Object> requestParamMap = new HashMap<>();
         requestParamMap.put("ts",ts);
         requestParamMap.put("key",key);
@@ -24,6 +26,18 @@
     }
 
     public static void main(String[] args) {
+        System.out.println(appkey);
         System.out.println(MesSyncUtil.getRequestParamMap());
+
+        String jsonString = "{\"msg\":\"鎿嶄綔鎴愬姛\",\"code\":200,\"data\":\"[]\"}";
+        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+        String data = jsonObject.getString("data");
+
+        System.out.println(data);
+        if(!Cools.isEmpty(data)){
+            System.out.println(data);
+        }
+
+
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index be67486..92bcbd5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -71,10 +71,10 @@
     path: /api/SX3WMS/StorageIn
   pakout:
     uri: http://fmis.huashijie.com.cn:8082
-    path: /api/SX3WMS/StorageInCheck
+    path: /api/SX3WMS/StorageOut
   pakin-sync:
     uri: http://fmis.huashijie.com.cn:8082
-    path: /api/SX3WMS/StorageOut
+    path: /api/SX3WMS/StorageInCheck
   pakout-sync:
     uri: http://fmis.huashijie.com.cn:8082
     path: /api/SX3WMS/StorageOutCheck

--
Gitblit v1.9.1