From 8ac5960c678c1f7739b24ed1e99a98e2ef30afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Thu, 13 Jul 2023 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E9=99=90=E9=87=8D=E8=BF=9E=EF=BC=8C?=
 =?UTF-8?q?=E9=9A=8F=E8=A1=8C=E4=B8=8D=E5=86=8DorderNum=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/config/ConfigProperties.java  |  4 ++--
 .../java/com/zhehekeji/web/mapper/OrderMapper.java  |  2 +-
 .../zhehekeji/web/service/ksec/KsecNettyClient.java |  8 +++++++-
 .../web/service/putian/PuTianNettyClient.java       | 13 +++++++------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
index 9042e8e..c2ecca6 100644
--- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
+++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
@@ -92,8 +92,8 @@ public class ConfigProperties {
     public static class KSEC{
         private String ip;
         private Integer port;
-//        private Integer reconnectNum = 10;
-//        private long reconnectInterval = 10000;
+        private Integer reconnectNum = 10;
+        private long reconnectInterval = 10000;
     }
 
     @Data
diff --git a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java b/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java
index 22f6cc8..1dfe1c5 100644
--- a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java
+++ b/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface OrderMapper extends BaseMapper<Order> {
 
-    @Select("select * from `order` where order_num = #{orderNum} limit 1")
+    @Select("select * from `order` where order_num = #{orderNum} order by start_time desc limit 1")
     Order getOneByOrderNum(String orderNum);
 
     List<OrderVO> list(@Param("req")OrderSearch orderSearch);
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
index 9d4ceeb..66b0f4f 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
@@ -66,7 +66,13 @@ public class KsecNettyClient {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        while (num < RECONNECT_NUM && !isConnected) {
+        while (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) {
+
+            try {
+                Thread.sleep(ksec.getReconnectInterval());
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             try {
                 createClient(ksec);
             } catch (Exception e) {
diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PuTianNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/putian/PuTianNettyClient.java
index ca0a4e3..bf9ff5c 100644
--- a/web/src/main/java/com/zhehekeji/web/service/putian/PuTianNettyClient.java
+++ b/web/src/main/java/com/zhehekeji/web/service/putian/PuTianNettyClient.java
@@ -32,10 +32,6 @@ public class PuTianNettyClient {
     @Resource
     private EmptyCheckService emptyCheckService;
 
-    /**
-     * 重连最大次数
-     */
-    private static int RECONNECT_NUM = 10;
 
     private static Channel channel;
 
@@ -71,8 +67,13 @@ public class PuTianNettyClient {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-//        while (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) {
-        while (num < RECONNECT_NUM && !isConnected) {
+        while (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) {
+        //while (num < RECONNECT_NUM && !isConnected) {
+            try {
+                Thread.sleep(ksec.getReconnectInterval());
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             try {
                 createClient(ksec);
             } catch (Exception e) {