From 1d43e01376590a26a8e976a398b4744b6906cab4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 18:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/task/OsdTask.java |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 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 3bde6d8..ae12191 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -4,6 +4,7 @@
 import com.mongodb.client.result.DeleteResult;
 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.OSDResult;
 import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
@@ -65,7 +66,6 @@
      */
     public void getOSD() {
         log.info("寮�濮嬭幏鍙朞SD");
-//        YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);
         //鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
         List<String> hkList = new ArrayList<>();
         //鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
@@ -88,25 +88,30 @@
             );
             List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
             monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
-            log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
+//            log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
             for (TMonitor monitor : monitors) {
                 executorService.submit(() -> {
                     if (DeviceType.HK.getType().equals(monitor.getDeviceType())) {
-                        //娴峰悍鍝佺墝
+                        //娴峰悍
                         OSDResult osd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
                         if (checkSuccess(osdResultList, monitor, osd)) {
                             log.info("娴峰悍璋冪敤鎴愬姛" + osd);
                             return;
                         }
                     } else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
-                        //澶у崕鍝佺墝
+                        //澶у崕
                         OSDResult osd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
                         if (checkSuccess(osdResultList, monitor, osd)) {
                             log.info("澶у崕璋冪敤鎴愬姛" + osd);
                             return;
                         }
                     } else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
-                        //TODO锛氬畤瑙哸pi
+                        //瀹囪
+                        OSDResult osd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
+                        if (checkSuccess(osdResultList, monitor, osd)) {
+                            log.info("瀹囪璋冪敤鎴愬姛" + osd);
+                            return;
+                        }
                     }
                     //鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi
                     OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList);
@@ -137,6 +142,7 @@
                 //灏佽OsdCheckResult
                 OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
                 checkCorrect(osdResult, monitor, osdCheckResult);
+                log.info("鏍￠獙缁撴灉锛歿}",osdCheckResult);
                 checkResults.add(osdCheckResult);
             }
             log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
@@ -154,14 +160,14 @@
             }
             //淇敼鏁版嵁搴撳搧鐗�
             if (!CollectionUtils.isEmpty(hkList)) {
-                log.info("淇敼鍝佺墝");
                 monitorMapper.batchUpdateDeviceType(hkList, DeviceType.HK.getType());
             }
             if (!CollectionUtils.isEmpty(dhList)) {
-                log.info("淇敼鍝佺墝");
                 monitorMapper.batchUpdateDeviceType(dhList, DeviceType.DH.getType());
             }
-            //TODO:瀹囪
+            if (!CollectionUtils.isEmpty(ysList)) {
+                monitorMapper.batchUpdateDeviceType(ysList, DeviceType.YS.getType());
+            }
         }
         log.info("缁撴潫鑾峰彇OSD");
     }
@@ -194,10 +200,12 @@
             }
         }
         //妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
+        //鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
         if (!StringUtils.isEmpty(osdResult.getName()) && !StringUtils.isEmpty(monitor.getName())) {
-            if (monitor.getName().equals(osdResult.getName())) {
+            if (monitor.getName().equals(osdResult.getName()) || monitor.getName().replace("鍏ㄦ櫙","缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭","鍏ㄦ櫙").equals(osdResult.getName())) {
                 osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
-            } else {
+                osdCheckResult.setOsdName(osdResult.getName());
+            }else {
                 osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
             }
         }
@@ -261,7 +269,16 @@
             }
             return dhosd;
         }
-        //TODO锛氬畤瑙哸pi
+        //瀹囪api
+        OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
+        if (ysosd != null) {
+            ysosd.setSerialNumber(monitor.getSerialNumber());
+            log.info("瀹囪璋冪敤鎴愬姛"+ysosd);
+            synchronized (ysList) {
+                ysList.add(monitor.getSerialNumber());
+            }
+            return ysosd;
+        }
         return null;
     }
 }

--
Gitblit v1.8.0