From 694d691291f6ee89061fdbb9fd451ecb5519b69b Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 05 十二月 2022 15:35:26 +0800
Subject: [PATCH] 在线状态由map改成redis,定时保持emqx链接

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java |   56 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
index 356ccc3..0c9ff5a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
@@ -53,7 +53,28 @@
         System.out.println("nvInit(sdk 鍒濆鍖�):");
         System.out.println(instance.nvInit(rootDir, companyInfo));
 
+        StatusVO searchVO = new StatusVO();
+        System.out.println("ViplexCore Demo nvSearchTerminalAsync(鎼滅储) begin... ");
 
+        CountDownLatch countDownLatch1 = new CountDownLatch(1);
+        instance.nvSearchTerminalAsync(new ViplexCore.CallBack() {
+
+            @Override
+            public void dataCallBack(int code, String data) {
+                searchVO.setStatusCode(code);
+                searchVO.setStatusData(data);
+                loginInfo = data;
+                System.out.println("\nViplexCore 鎼滅储 code:" + code);
+                System.out.println("\nViplexCore 鎼滅储 data:" + data);
+                countDownLatch1.countDown();
+            }
+        });
+
+        try {
+            countDownLatch1.await(10000, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
 //        login("MZVA51930N2113017308");
     }
 
@@ -78,28 +99,6 @@
      * 5锛氬叕缃慡DK鐧诲綍
      */
     public StatusVO login(String sn, Integer loginType) {
-
-        StatusVO searchVO = new StatusVO();
-        System.out.println("ViplexCore Demo nvSearchTerminalAsync(鎼滅储) begin... ");
-
-        CountDownLatch countDownLatch1 = new CountDownLatch(1);
-        instance.nvSearchTerminalAsync(new ViplexCore.CallBack() {
-
-            @Override
-            public void dataCallBack(int code, String data) {
-                searchVO.setStatusCode(code);
-                searchVO.setStatusData(data);
-                loginInfo = data;
-                System.out.println("\nViplexCore 鎼滅储 code:" + code);
-                System.out.println("\nViplexCore 鎼滅储 data:" + data);
-                countDownLatch1.countDown();
-            }
-        });
-        try {
-            countDownLatch1.await(10000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
 
         if (loginSn.get(sn) != null && loginSn.get(sn) && loginType == 0) {
             return new StatusVO(0);
@@ -945,15 +944,18 @@
                         newNova.setScreenShot(data);
                     }
                     countDownLatch.countDown();
+
+                    try {
+                        countDownLatch.await(5000, TimeUnit.MILLISECONDS);
+                    } catch (InterruptedException ex) {
+                        throw new RuntimeException(ex);
+                    }
+
                 }
+
             });
 
         });
-        try {
-            countDownLatch.await(30000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
 
         return param.getScreenShotList();
     }

--
Gitblit v1.9.3