From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 48 +++++++++++++++++++++++++++++-------------------
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 2 ++
2 files changed, 31 insertions(+), 19 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 eb030f7..4ebafcc 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
@@ -217,16 +217,24 @@
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
-// log.info("TEXT锛�"+osdStr);
+ log.error("TEXT锛�"+osdStr);
if (!StringUtils.isEmpty(osdStr)) {
- if (num == 0) {
- osdResult.setOSD1(osdStr);
- } else if (num == 1) {
- osdResult.setOSD2(osdStr);
- } else if (num == 2) {
- osdResult.setOSD3(osdStr);
- } else if (num == 3) {
- osdResult.setName(osdStr);
+ if (osdStr.contains("|")) {
+ String[] osdNames = osdStr.split("\\|");
+ osdResult.setOSD1(osdNames[0]);
+ osdResult.setOSD2(osdNames[1]);
+ osdResult.setOSD3(osdNames[2]);
+ osdResult.setName(osdNames[3]);
+ } else {
+ if (num == 0) {
+ osdResult.setOSD1(osdStr);
+ } else if (num == 1) {
+ osdResult.setOSD2(osdStr);
+ } else if (num == 2) {
+ osdResult.setOSD3(osdStr);
+ } else if (num == 3) {
+ osdResult.setName(osdStr);
+ }
}
}
num++;
@@ -240,6 +248,7 @@
/**
* 閽堝鍒╂棫璁惧鑾峰彇OSD鐨勬柟娉�
+ *
* @param serialNumber
* @param loginId
* @return
@@ -256,13 +265,13 @@
log.error("e涓虹┖,灏濊瘯鍙︿竴涓�氶亾");
e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 1, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
}
- if(e) {
+ if (e) {
osdInfo4.read();
NetSDKLib.NET_CUSTOM_TITLE_INFO[] stuCustomTitle = osdInfo4.stuCustomTitle;
for (NetSDKLib.NET_CUSTOM_TITLE_INFO net_custom_title_info : stuCustomTitle) {
String name = new String(net_custom_title_info.szText, StandardCharsets.UTF_8).trim();
- log.info("name:{}",name);
- if(StringUtils.isNotEmpty(name) && name.contains("|")){
+ log.error("name:{}", name);
+ if (StringUtils.isNotEmpty(name) && name.contains("|")) {
String[] osdNames = name.split("\\|");
//鍓旈櫎鎺夌┖涓�
// List<String> nonEmptyList = new ArrayList<>();
@@ -277,27 +286,28 @@
result.setName(osdNames[3]);
}
}
- }else {
- log.error(serialNumber,"鍒╂棫osd涓虹┖");
+ } else {
+ log.error(serialNumber, "鍒╂棫osd涓虹┖");
}
return result;
}
/**
* 鑾峰彇鍗曚釜閰嶇疆
+ *
* @param hLoginHandle 鐧婚檰鍙ユ焺
- * @param nChn 閫氶亾鍙凤紝-1 琛ㄧず鍏ㄩ�氶亾
- * @param strCmd 閰嶇疆鍚嶇О
- * @param cmdObject 閰嶇疆瀵瑰簲鐨勭粨鏋勪綋瀵硅薄
+ * @param nChn 閫氶亾鍙凤紝-1 琛ㄧず鍏ㄩ�氶亾
+ * @param strCmd 閰嶇疆鍚嶇О
+ * @param cmdObject 閰嶇疆瀵瑰簲鐨勭粨鏋勪綋瀵硅薄
* @return 鎴愬姛杩斿洖 true
*/
public static boolean GetDevConfig(LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) {
boolean result = false;
IntByReference error = new IntByReference(0);
- int nBufferLen = 2*1024*1024;
+ int nBufferLen = 2 * 1024 * 1024;
byte[] strBuffer = new byte[nBufferLen];
- if(netsdk.CLIENT_GetNewDevConfig( hLoginHandle, strCmd , nChn, strBuffer, nBufferLen,error,3000,null)) {
+ if (netsdk.CLIENT_GetNewDevConfig(hLoginHandle, strCmd, nChn, strBuffer, nBufferLen, error, 3000, null)) {
cmdObject.write();
if (netsdk.CLIENT_ParseData(strCmd, strBuffer, cmdObject.getPointer(),
cmdObject.size(), null)) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index f8ae9e7..3406bf0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -336,6 +336,7 @@
// 娣诲姞鍥哄畾鏉′欢
criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
// 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
if (params.getDataType() == 1) {
criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
@@ -436,6 +437,7 @@
// 娣诲姞鍥哄畾鏉′欢
criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ criteriaList.add(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
// 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
if (params.getDataType() == 1) {
criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
--
Gitblit v1.8.0