From a880b5148b793e7cb111bbab82fc0bb23a628c02 Mon Sep 17 00:00:00 2001
From: QuShuailong <qu.shuailong@hzleaper.com>
Date: Sat, 8 Apr 2023 10:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=AD=E7=82=B9=E9=87=8D=E8=BF=9E=E7=9A=84?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=92=8C=E9=97=B4=E9=9A=94=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=87=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=94=AF=E6=8C=81=E6=97=A0=E9=99=90=E6=AC=A1?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=EF=BC=9B=E6=B7=BB=E5=8A=A0=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E6=8B=8D=E7=85=A7=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/config/ConfigProperties.java          |  3 +++
 .../com/zhehekeji/web/service/PlcService.java |  5 +++--
 .../web/service/ksec/KsecNettyClient.java     | 19 +++++++++++--------
 web/src/main/resources/application-prod.yml   |  6 ++++++
 4 files changed, 23 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 2c919dd..8e870af 100644
--- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
+++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
@@ -59,6 +59,7 @@ public class ConfigProperties {
         private Long C3DelayCaptureTime;
         private Long C4DelayCaptureTime;
         private Long C4OutDelayCaptureTime;
+        private Long EDelayCaptureTime;
         private Long B2DelayTime;
         private Long B2OutDelayTime;
 
@@ -82,6 +83,8 @@ public class ConfigProperties {
     public static class KSEC{
         private String ip;
         private Integer port;
+        private Integer reconnectNum;
+        private Long reconnectInterval;
     }
 
     @Data
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 67a26b2..88036df 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -571,6 +571,7 @@ public class PlcService {
             log.info("camera ptz"+c);
             gyrateCameraByCode(cameraIdTop, c);
         }else {
+            log.info("camera ptz"+cmdCode);
             gyrateCameraByCode(cameraIdTop, cmdCode);
             try {
                 Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
@@ -583,7 +584,7 @@ public class PlcService {
         String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
         //拍照暂停1s再拍
         try {
-            Thread.sleep(1000l);
+            Thread.sleep(configProperties.getCameraConfig().getEDelayCaptureTime());
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -593,7 +594,7 @@ public class PlcService {
         log.info("camera ptz"+e2);
         gyrateCameraByCode(cameraId, e2);
         try {
-            Thread.sleep(1500l);
+            Thread.sleep(configProperties.getCameraConfig().getEDelayCaptureTime());
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
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 e5e3b25..8c871b8 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
@@ -25,11 +25,6 @@ public class KsecNettyClient {
     @Resource
     private ConfigProperties configProperties;
 
-    /**
-     * 重连最大次数
-     */
-    private static int RECONNECT_NUM = 10;
-
     private static Channel channel;
 
     public void createClient(ConfigProperties.KSEC ksec) throws InterruptedException {
@@ -67,13 +62,21 @@ public class KsecNettyClient {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        while (num < RECONNECT_NUM && !isConnected) {
+        while (ksec.getReconnectNum() == -1 && num < ksec.getReconnectNum() && !isConnected) {
             try {
                 createClient(ksec);
-            } catch (Exception e) {
-                //没连上 继续
+            }
+            //没连上 继续
+            catch (Exception e) {
+                //关闭当前链接
+                channel.close();
                 log.error("reconnect error num:{}", num);
                 num++;
+                try{
+                    Thread.sleep(ksec.getReconnectInterval());
+                }catch (Exception ex){
+                    throw new RuntimeException(ex);
+                }
                 continue;
             }
             isConnected = true;
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index eca8fbf..b96ba19 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/web/src/main/resources/application-prod.yml
@@ -45,6 +45,8 @@ cameraConfig:
   C3DelayCaptureTime: 1500
   C4DelayCaptureTime: 1500
   C4OutDelayCaptureTime: 1500
+  # 盘点延时多久拍照
+  EDelayCaptureTime: 2500
   # 发了B2之后多久转原点位
   B2DelayTime: 2000
   # 外侧货架发了B2多久转原点位
@@ -63,6 +65,10 @@ serverMode: 1
 ksec:
   ip: 192.168.168.11
   port: 8001
+  #断点重连的次数：-1->不断重连
+  reconnectNum: -1
+  #断点重连的时间间隔(单位：ms)
+  reconnectInterval: 10000
 # ------------ 实时视频流  全部页面的格式  行列数量
 videoStyleConfig:
   videoStyleRow: 4