From b85542765637358cb1473629d0ea767ac076aec3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 13:36:26 +0800
Subject: [PATCH] 图片压缩
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 2fab0ee..6db0349 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -2,10 +2,16 @@
import com.mongodb.client.result.DeleteResult;
+import com.ycl.api.DH.lib.NetSDKLib;
+import com.ycl.api.DH.lib.structure.NET_CFG_GBMODE_INFO;
+import com.ycl.api.DH.lib.structure.NET_GBMODE_CUSTOMTITLE_INFO;
+import com.ycl.api.DH.lib.structure.NET_TITLE_OSD_INFO;
+import com.ycl.api.DH.module.LoginModule;
import com.ycl.api.DH.utils.DHApi;
import com.ycl.api.HK.HKApi;
import com.ycl.api.YS.YSApi;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.BaseResult;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
@@ -29,6 +35,9 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -36,6 +45,8 @@
import java.util.concurrent.*;
import java.util.function.Function;
import java.util.stream.Collectors;
+
+import static com.ycl.api.DH.lib.enumeration.NET_EM_CFG_OPERATE_TYPE.NET_EM_CFG_GBMODE;
@Slf4j
@Component("OsdTask")
@@ -60,6 +71,7 @@
public String YSUserName;
@Value("${YS.password}")
public String YSPassword;
+
/**
* 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
* 绛涢�夎棰戣澶�
@@ -86,7 +98,7 @@
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
//闇�瑕佽�冩牳鐨勬暟鎹�
List<String> serialNumbers = oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(serialNumbers)) {
+ if (!CollectionUtils.isEmpty(serialNumbers)) {
ExecutorService executorService = new ThreadPoolExecutor(16,
128,
5000,
@@ -98,9 +110,7 @@
//杩囨护鎺夋棤鏁坕p骞剁瓫閫夊嚭瑙嗛璁惧
monitors = monitors.stream()
.filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) &&
- !"127.0.0.1".equals(monitor.getIp()) &&
- monitor.getCameraFunType()!=null &&
- monitor.getCameraFunType().contains("1"))
+ !"127.0.0.1".equals(monitor.getIp()))
.collect(Collectors.toList());
List<Future<OSDResult>> futureList = new ArrayList<>(48);
List<OSDResult> osdResultList = new ArrayList<>();
@@ -118,7 +128,7 @@
List<OsdCheckResult> checkResults = new ArrayList<>();
Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
for (OSDResult osdResult : osdResultList) {
- if(osdResult!=null) {
+ if (osdResult != null) {
TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
//灏佽OsdCheckResult
OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
@@ -133,8 +143,19 @@
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query pyQuery = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ List<OsdCheckResult> osdCheckResults = mongoTemplate.find(pyQuery, OsdCheckResult.class);
+ pointService.setDeviceTagByGB(checkResults, CheckConstants.Rule_Category_Video);
+ //娣诲姞鏃ф暟鎹繘鍘�
+ List<String> resultNos = checkResults.stream().map(BaseResult::getNo).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(osdCheckResults)) {
+ for (OsdCheckResult mongoResult : osdCheckResults) {
+ //濡傛灉鏂扮殑缁撴灉涓病鏈夋棫鏁版嵁閭ｄ箞鍔犺繘鍘�
+ if (!resultNos.contains(mongoResult.getNo())) {
+ checkResults.add(mongoResult);
+ }
+ }
+ }
DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
- pointService.setDeviceTagByGB(checkResults,CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(checkResults);
// 宸ュ崟鐢熸垚
@@ -172,7 +193,7 @@
} else {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
}
- }else {
+ } else {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
@@ -183,7 +204,7 @@
} else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
}
- }else {
+ } else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ョ渷鏄惁姝ｇ‘
@@ -193,7 +214,7 @@
} else {
osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
}
- }else {
+ } else {
osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ競鏄惁姝ｇ‘
@@ -203,7 +224,7 @@
} else {
osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
}
- }else {
+ } else {
osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ尯鍘挎槸鍚︽纭�
@@ -214,10 +235,17 @@
} else {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
}
- }else {
+ } else {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
}
}
+ public void test() throws ExecutionException, InterruptedException {
+ log.info("娴嬭瘯鑾峰彇OSD");
+ OSDResult osd3 = DHApi.getOsdOld("","51030340001320207201", "51.95.34.20", DHUserName, DHPassword);
+ log.info("osd3:{}", osd3);
+ OSDResult osd4 = DHApi.getOsdOld("","51030342001320173201", "51.95.33.174", DHUserName, DHPassword);
+ log.info("osd4:{}", osd4);
+ }
}
--
Gitblit v1.8.0