无限重连，随行不再orderNum不再唯一

南京物流数据库格式不同报错修改

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 Integer reconnectNum = 10;
-//        private long reconnectInterval = 10000;
+        private long reconnectInterval = 10000;
     }
 
     @Data

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 into_stock_time desc limit 1")
     Order getOneByOrderNum(String orderNum);
 
     List<OrderVO> list(@Param("req")OrderSearch orderSearch);

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -610,11 +610,12 @@ public class PlcService {
         order.setIntoStockTime(LocalDateTime.now());
         order.setRow1(row);
         order.setColumn1(column);
-        if (oldOrder != null){
+//        if (oldOrder != null){
-            orderMapper.updateById(order);
+//            orderMapper.updateById(order);
-        }else{
+//        }else{
+//            orderMapper.insert(order);
+//        }
         orderMapper.insert(order);
-        }
         cameraCapture(cameraId,false,0l,path);
         return configProperties.getIP()+":9007/api/pic/"+path;
     }

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) {

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 (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) {
-        while (num < RECONNECT_NUM && !isConnected) {
+        //while (num < RECONNECT_NUM && !isConnected) {
+            try {
+                Thread.sleep(ksec.getReconnectInterval());
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             try {
                 createClient(ksec);
             } catch (Exception e) {