From edc7172b312e0aec94362b651e2f7145e0c357fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 16 一月 2025 17:04:10 +0800
Subject: [PATCH] 核算导出调整+osd测试脚本

---
 ycl-server/src/main/java/com/ycl/task/OsdTask.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 1e75898..83c71f5 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -2,6 +2,11 @@
 
 
 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;
@@ -29,6 +34,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 +44,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 +70,7 @@
     public String YSUserName;
     @Value("${YS.password}")
     public String YSPassword;
+
     /**
      * 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
      * 绛涢�夎棰戣澶�
@@ -86,7 +97,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,
@@ -116,7 +127,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);
@@ -132,7 +143,7 @@
                 Query pyQuery = new Query(Criteria
                         .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
                 DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
-                pointService.setDeviceTagByGB(checkResults,CheckConstants.Rule_Category_Video);
+                pointService.setDeviceTagByGB(checkResults, CheckConstants.Rule_Category_Video);
                 //瀛樻斁鍦╩ongo涓�
                 mongoTemplate.insertAll(checkResults);
                 // 宸ュ崟鐢熸垚
@@ -170,7 +181,7 @@
             } else {
                 osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
             }
-        }else {
+        } else {
             osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
@@ -181,7 +192,7 @@
             } else {
                 osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
             }
-        }else {
+        } else {
             osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ョ渷鏄惁姝ｇ‘
@@ -191,7 +202,7 @@
             } else {
                 osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
             }
-        }else {
+        } else {
             osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ュ競鏄惁姝ｇ‘
@@ -201,7 +212,7 @@
             } else {
                 osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
             }
-        }else {
+        } else {
             osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ュ尯鍘挎槸鍚︽纭�
@@ -212,10 +223,15 @@
             } 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.getOsd("51030446001320141102","51.95.68.3", DHUserName, DHPassword);
+        log.info("澶у崕缁撴灉鏁版嵁:{}",osd3);
+    }
 }

--
Gitblit v1.8.0