From 746a85a842adc99322b364d1c564a624dce62429 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 30 十月 2024 23:01:49 +0800
Subject: [PATCH] 工单阈值bug、工单分页故障查询bug、工单未进入下发表bug

---
 ycl-server/src/main/java/com/ycl/task/OsdTask.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 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 9408335..1a5a659 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -47,13 +47,24 @@
     private UYErrorTypeCheckService uyErrorTypeCheckService;
     @Autowired
     private YwPointService pointService;
+    @Value("${HK.userName}")
+    public String HKUserName;
+    @Value("${HK.password}")
+    public String HKPassword;
+    @Value("${DH.userName}")
+    public String DHUserName;
+    @Value("${DH.password}")
+    public String DHPassword;
+    @Value("${YS.userName}")
+    public String YSUserName;
+    @Value("${YS.password}")
+    public String YSPassword;
     /**
      * 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
      * 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
      * 姣斿mongoDB涓�鏈轰竴妗ｄ俊鎭紝鏁寸悊鎴恟esult瀛樺叆mongo
      * 鍚屾鍝佺墝鍒癿ysql
      */
-    //TODO锛氬ぇ鍗庡姩鎬佸簱linux鎹綅缃�
     public void getOSD() throws ExecutionException, InterruptedException {
         log.info("寮�濮嬭幏鍙朞SD");
         //鏌ヤ竴鏈轰竴妗onitor
@@ -75,7 +86,7 @@
             List<Future<OSDResult>> futureList = new ArrayList<>(48);
             List<OSDResult> osdResultList = new ArrayList<>();
             for (TMonitor monitor : monitors) {
-                OSDCheckThread thread = new OSDCheckThread(monitor);
+                OSDCheckThread thread = new OSDCheckThread(monitor,HKUserName,HKPassword,DHUserName,DHPassword,YSUserName,YSPassword);
                 Future<OSDResult> future = executorService.submit(thread);
                 futureList.add(future);
             }
@@ -88,12 +99,14 @@
             List<OsdCheckResult> checkResults = new ArrayList<>();
             Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
             for (OSDResult osdResult : osdResultList) {
-                TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
-                //灏佽OsdCheckResult
-                OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
-                checkCorrect(osdResult, monitor, osdCheckResult);
-                log.info("鏍￠獙缁撴灉锛歿}",osdCheckResult);
-                checkResults.add(osdCheckResult);
+                if(osdResult!=null) {
+                    TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
+                    //灏佽OsdCheckResult
+                    OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
+                    checkCorrect(osdResult, monitor, osdCheckResult);
+                    log.info("鏍￠獙缁撴灉锛歿}", osdCheckResult);
+                    checkResults.add(osdCheckResult);
+                }
             }
             log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
             //缁撴灉瀛樺叆mongo
@@ -116,6 +129,7 @@
     private OsdCheckResult getOsdCheckResult(OSDResult osdResult, TMonitor monitor) {
         OsdCheckResult osdCheckResult = new OsdCheckResult();
         osdCheckResult.setDeviceNo(osdResult.getSerialNumber());
+        osdCheckResult.setNo(osdResult.getSerialNumber());
         osdCheckResult.setIp(monitor.getIp());
         osdCheckResult.setDeviceType(monitor.getCameraFunType());
         osdCheckResult.setCheckTime(osdResult.getCheckTime());
@@ -140,6 +154,8 @@
             } else {
                 osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
             }
+        }else {
+            osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
         //鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
@@ -150,6 +166,8 @@
             } else {
                 osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
             }
+        }else {
+            osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ョ渷鏄惁姝ｇ‘
         if (!StringUtils.isEmpty(osdResult.getOSD1())) {
@@ -158,6 +176,8 @@
             } else {
                 osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
             }
+        }else {
+            osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ュ競鏄惁姝ｇ‘
         if (!StringUtils.isEmpty(osdResult.getOSD2())) {
@@ -166,15 +186,19 @@
             } else {
                 osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
             }
+        }else {
+            osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
         }
         //妫�鏌ュ尯鍘挎槸鍚︽纭�
         if (!StringUtils.isEmpty(osdResult.getOSD3())) {
             AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(monitor.getSerialNumber().substring(0, 6));
-            if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getName())) {
+            if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getOsdName())) {
                 osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Correct);
             } else {
                 osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
             }
+        }else {
+            osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
         }
     }
 

--
Gitblit v1.8.0