From 23fc1a4a8de125d8bee6fc602e767a5310b89f3e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 07 四月 2025 17:34:08 +0800
Subject: [PATCH] 新设备品牌名,通道问题，
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 10 ++++++++++
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 36 +++++++++++++++++++++++++++++++++++-
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 5 +++--
3 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
index 08dc0b9..c169561 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -270,6 +270,16 @@
if (!e) {
log.error("e涓虹┖");
}
+ }else if(moName.startsWith("DX_RD")){ //鍒ゆ柇璁惧鏄惁鏄疍X_RD寮�澶�
+ if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_All) {
+ e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
+ }
+ else if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_Detail) {
+ e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 1, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
+ }
+ if (!e) {
+ log.error("e涓虹┖");
+ }
}else {
e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
if (!e) {
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 40fd8f6..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,8 +3,10 @@
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;
@@ -13,13 +15,14 @@
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();
@@ -95,7 +98,27 @@
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;
+ }
+ }
+
if (StringUtils.isNotEmpty(name) && name.contains("|")){
String[] osdNames = name.split("\\|");
for (int i = 0; i < osdNames.length; i++) {
@@ -144,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();
}
diff --git a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
index e9d10d7..8a4c4d2 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -48,7 +48,8 @@
}
} else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
//瀹囪
- OSDResult osd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+ OSDResult osd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
return osd;
@@ -75,7 +76,7 @@
return dhosd;
}
//瀹囪api
- OSDResult ysosd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+ OSDResult ysosd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
return ysosd;
--
Gitblit v1.8.0