From eb844dbc762cfbd65f027229a9fc43469aaf65d0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 14:57:24 +0800
Subject: [PATCH] 考核模板定时任务getList分离
---
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index 6843e77..6ae2f35 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -6,6 +6,7 @@
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.platform.domain.result.OSDResult;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import java.nio.charset.StandardCharsets;
@@ -93,9 +94,11 @@
//鐪佷唤
String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
osdResult.setOSD1(name);
+// log.info("name"+name);
int num = 0;
for (NetDEVSDKLib.NETDEV_OSD_TEXT_OVERLAY_S osd : stOSDInfo.astTextOverlay) {
String text = new String(osd.szOSDText, StandardCharsets.UTF_8).trim();
+// log.info("num:"+num+",texr:"+text);
if (num == 0) {
osdResult.setOSD2(text);
} else if (num == 1) {
@@ -109,6 +112,7 @@
}
//鐧诲嚭
YSInit.netdevsdk.NETDEV_Logout(lpUserID);
+ osdResult.setDeviceBrand(DeviceType.YS.getType());
return osdResult;
} else {
// log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
--
Gitblit v1.8.0