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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 03fc9d6..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
@@ -95,12 +95,23 @@
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("\\|");
- osdResult.setOSD1(osdNames[0]);
- osdResult.setOSD2(osdNames[1]);
- osdResult.setOSD3(osdNames[2]);
- osdResult.setName(osdNames[3]);
+ 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]);
+ }
+ }
}else {
//鐪佷唤
osdResult.setOSD1(name);
@@ -108,7 +119,7 @@
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);
+ log.info("YSnum:"+num+",YStexr:"+text);
if (num == 0) {
osdResult.setOSD2(text);
} else if (num == 1) {
--
Gitblit v1.8.0