From d384786ab5868cd4d856691372eee5359e7d9b2c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 28 三月 2025 17:48:47 +0800
Subject: [PATCH] 导出新增 连个列，以及同步数据库时点位名修改未成功问题
---
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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..40fd8f6 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,8 @@
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.platform.domain.result.OSDResult;
+import com.ycl.utils.StringUtils;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import java.nio.charset.StandardCharsets;
@@ -90,25 +92,51 @@
return null;
}
stOSDInfo.read();
- //鐪佷唤
- String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
- osdResult.setOSD1(name);
- int num = 0;
- for (NetDEVSDKLib.NETDEV_OSD_TEXT_OVERLAY_S osd : stOSDInfo.astTextOverlay) {
- String text = new String(osd.szOSDText, StandardCharsets.UTF_8).trim();
- if (num == 0) {
- osdResult.setOSD2(text);
- } else if (num == 1) {
- osdResult.setOSD3(text);
- } else if (num == 2) {
- osdResult.setName(text);
- } else if (num == 3) {
- osdResult.setOSD4(text);
+
+
+ String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
+ log.error("YSname:{}" , name);
+ if (StringUtils.isNotEmpty(name) && name.contains("|")){
+ String[] osdNames = name.split("\\|");
+ for (int i = 0; i < osdNames.length; i++) {
+ if (i == 0) {
+ osdResult.setOSD1(osdNames[i]);
+ }
+ if (i == 1) {
+ osdResult.setOSD2(osdNames[i]);
+ }
+ if (i == 2) {
+ osdResult.setOSD3(osdNames[i]);
+ }
+ if (i == 3) {
+ osdResult.setName(osdNames[i]);
+ }
}
- num++;
+ }else {
+ //鐪佷唤
+ osdResult.setOSD1(name);
+// log.info("YSname"+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("YSnum:"+num+",YStexr:"+text);
+ if (num == 0) {
+ osdResult.setOSD2(text);
+ } else if (num == 1) {
+ osdResult.setOSD3(text);
+ } else if (num == 2) {
+ osdResult.setName(text);
+ } else if (num == 3) {
+ osdResult.setOSD4(text);
+ }
+ num++;
+ }
}
+
+
//鐧诲嚭
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