From 2e188d5dd68f13763aa058cb9776ba897c4ef181 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 4 Apr 2025 18:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManService.java       |  4 ++--
 .../com/glxp/api/service/sync/HeartService.java     |  1 -
 .../glxp/api/service/sync/WebSocketComponent.java   |  6 ++----
 .../java/com/glxp/api/task/SyncHeartService.java    | 13 +++++++------
 src/main/java/com/glxp/api/util/OkHttpCli.java      |  1 -
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index 4eb966027..fd7a47985 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -503,7 +503,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                                     }
                                     int myUseCount = calCountUtil.getUseActCount(udiRelevanceResponse);
                                     if (needCount > myUseCount) {
-                                        throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
+                                        throw new JsonException(502, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                                     } else {
                                         collectOrderBiz.setSplitUnCheck(true);
                                         if (IntUtil.value(collectSet.getLastCodeSplit())) {
@@ -511,7 +511,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                                         }
                                     }
                                 } else {
-                                    throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
+                                    throw new JsonException(502, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                                 }
 
                             }
diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index 2cdcac1a9..60a2ce730 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1537,7 +1537,6 @@ public class HeartService {
         Date startTime = new Date();
 
         String data = spGetHttp.pullData(exportType);
-        ;
         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data);
         Integer code = obj.getInt("code");
         if (!code.equals(20000)) {
diff --git a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java
index 7ba9cbe07..63346e2fd 100644
--- a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java
+++ b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java
@@ -34,7 +34,6 @@ public class WebSocketComponent implements CommandLineRunner {
     SocketMsgService socketMsgService;
 
 
-
     @Resource
     IoStatOrderService statOrderService;
 
@@ -49,21 +48,20 @@ public class WebSocketComponent implements CommandLineRunner {
                 SpsWebSocketClient client = new SpsWebSocketClient("ws://" + ip + "/sps/web/sync/2/" + socketToken);
                 client.setSocketMsgService(socketMsgService);
                 initConnect(client);
-                //等待服务端响应
                 while (!client.getReadyState().equals(ReadyState.OPEN)) {
-//                    log.info("连接中···请稍后");
                     Thread.sleep(1000);
                 }
                 //等待WebSocket服务端响应
                 String message = null;
                 while (true) {
                     while ((message = client.getExcptMessage()) == null) {
-                        log.info("已连接，等待接收数据--------");
                         Thread.sleep(1000);
                         if (client.isClosed()) {
                             initConnect(client);
                         }
                     }
+
+                    log.info("接收到服务端消息：" + message);
                     if (message.equals(SocketMsgType.DL_ALL_DATA)) {
                         heartTaskService.pullData(null);
                     }
diff --git a/src/main/java/com/glxp/api/task/SyncHeartService.java b/src/main/java/com/glxp/api/task/SyncHeartService.java
index 1c5f42d99..00a813458 100644
--- a/src/main/java/com/glxp/api/task/SyncHeartService.java
+++ b/src/main/java/com/glxp/api/task/SyncHeartService.java
@@ -124,12 +124,13 @@ public class SyncHeartService {
                 e.printStackTrace();
                 log.error(ExceptionUtils.getStackTrace(e));
             }
-            try {
-                heartService.dlAllDiProducts();
-            } catch (Exception e) {
-                e.printStackTrace();
-                log.error(ExceptionUtils.getStackTrace(e));
-            }
+//            暂时注释掉DI下载
+//            try {
+//                heartService.dlAllDiProducts();
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//                log.error(ExceptionUtils.getStackTrace(e));
+//            }
             Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                 heartService.pullData(i);
             });
diff --git a/src/main/java/com/glxp/api/util/OkHttpCli.java b/src/main/java/com/glxp/api/util/OkHttpCli.java
index a853f71dc..b32843887 100644
--- a/src/main/java/com/glxp/api/util/OkHttpCli.java
+++ b/src/main/java/com/glxp/api/util/OkHttpCli.java
@@ -89,7 +89,6 @@ public class OkHttpCli {
             }
 
         }
-        log.info(sb.toString());
         Request request = builder.url(sb.toString()).build();
         log.info("do get request and url[{}]", sb.toString());
         return execute(request);