From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复

---
 ycl-server/src/main/java/com/ycl/api/YS/YSApi.java |   94 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 76 insertions(+), 18 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 6ae2f35..99c2336 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
@@ -3,22 +3,26 @@
 
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
+import com.ycl.api.DH.utils.DHApi;
 import com.ycl.api.YS.lib.NetDEVSDKLib;
 import com.ycl.api.YS.login.Login;
+import com.ycl.platform.domain.entity.TMonitor;
 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;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.regex.Pattern;
 
 import static com.ycl.api.YS.lib.NetDEVSDKLib.NETDEV_LOGIN_PROTO_E.NETDEV_LOGIN_PROTO_ONVIF;
 
 @Slf4j
 public class YSApi {
 
-    public static OSDResult getOsd(String ip, String userName, String password) {
+    public static OSDResult getOsd(TMonitor monitor, String ip, String userName, String password) {
         //鐧诲綍
         NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S stDevLoginInfo = new NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S();
         NetDEVSDKLib.NETDEV_SELOG_INFO_S stSELogInfo = new NetDEVSDKLib.NETDEV_SELOG_INFO_S();
@@ -91,25 +95,68 @@
                 return null;
             }
             stOSDInfo.read();
-            //鐪佷唤
-            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) {
-                    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();
+            //姝ｅ垯鍚嶅瓧 濡傛灉鍑虹幇鐗规畩瀛楃 鍒欒皟鐢╠h鐨勬帴鍙�
+            log.error("YSname:{}" , name);
+
+            // 姝ｅ垯琛ㄨ揪寮忥紙鍖归厤鍖呭惈 锟� 瀛楃鐨勫瓧绗︿覆锛�
+            String regex = ".*\\uFFFD.*"; // 鏍稿績閫昏緫锛氬尮閰嶄换鎰忎綅缃嚭鐜� 锟� 鐨勫瓧绗︿覆
+            // 缂栬瘧姝ｅ垯琛ㄨ揪寮�
+            Pattern pattern = Pattern.compile(regex);
+            boolean isMatch  = pattern.matcher(name).matches();
+            if(isMatch){
+                log.error("鍑虹幇姝ｅ垯鍚嶅瓧涓湁鐗规畩瀛楃:{}" , name);
+                //澶у崕
+                OSDResult osd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+                OSDResult osdResult2 = checkSuccess(monitor, osd);
+                log.error("osdResult2");
+                if (osdResult2!=null) {
+                    return osd;
+                }else {
+                    return null;
                 }
-                num++;
             }
+
+            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]);
+                    }
+                }
+            }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());
@@ -120,6 +167,17 @@
         }
     }
 
+    //OSDCheckThread鏂规硶
+    private static OSDResult checkSuccess(TMonitor monitor, OSDResult osd) {
+        if (osd != null) {
+            osd.setSerialNumber(monitor.getSerialNumber());
+            return osd;
+        } else {
+            return null;
+        }
+    }
+
+
     public static void demo() {
         Login.loginIn();
     }

--
Gitblit v1.8.0