From c104ea8b0bb99e058633770016abebe117d53d00 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期一, 05 十二月 2022 15:43:51 +0800
Subject: [PATCH] 新諾瓦批量截圖改成同步獲取截圖
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 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..59ddeaa 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);
@@ -912,14 +911,12 @@
System.out.println("ViplexCore Demo nvDownLoadScreenshotAsync(鎴睆) begin... ");
NovaFileConfig config = SpringContextHolder.getBean(NovaFileConfig.class);
String shotPath = config.getScreenShotPath();
- CountDownLatch countDownLatch = new CountDownLatch(param.getScreenShotList().size());
- param.getScreenShotList().forEach(newNova -> {
-
+ for(NewNovaStatusParam.NovascreenShotDTO newNova:param.getScreenShotList()){
StatusVO login = login(newNova.getSn(), 0);
if (login.getStatusCode() != 0) {
- countDownLatch.countDown();
- return;
+ continue;
}
+ CountDownLatch countDownLatch = new CountDownLatch(1);
String pictureName = newNova.getSn() + ".png";
String str = "{\n" +
" \"sn\":\"" + newNova.getSn() + "\",\n" +
@@ -947,14 +944,13 @@
countDownLatch.countDown();
}
});
-
- });
- try {
- countDownLatch.await(30000, TimeUnit.MILLISECONDS);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ //绛夊緟瑷倷鍥炶淇℃伅
+ try {
+ countDownLatch.await(5000, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException ex) {
+ throw new RuntimeException(ex);
+ }
}
-
return param.getScreenShotList();
}
--
Gitblit v1.9.3