From 1e89a0c2fc96040ba50d0fe4305ace22f3daa6cf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 11 八月 2023 15:35:21 +0800
Subject: [PATCH] 优化通用光电报警只获取小光电数据

---
 src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java |   67 ++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
index 9d77347..e5fa5e8 100644
--- a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
+++ b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
@@ -29,26 +29,32 @@
 @Slf4j(topic = "external")
 @Order(5)
 public class ArdEquipExternalServiceImpl implements IArdEquipExternalService, ApplicationRunner {
+
     private final static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+
     public static List<ArdEquipExternal> ardAlarmHostList = new ArrayList<>();
     public static List<ArdEquipExternal> ardAccessHostList = new ArrayList<>();
+
     @Autowired
     private ArdEquipExternalMapper ardEquipExternalMapper;
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args){
         //鑾峰彇鍏ㄩ儴娴峰悍鎶ヨ涓绘満灏濊瘯鐧诲綍
         ArdEquipExternal alarmHost = new ArdEquipExternal();
         alarmHost.setFactory("1");
         alarmHost.setType("1");
         ardAlarmHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
         HikClientUtil.loginAllAlarmHost(ardAlarmHostList);
+
         //鑾峰彇鍏ㄩ儴闂ㄧ涓绘満灏濊瘯鐧诲綍
         ArdEquipExternal accessControlHost = new ArdEquipExternal();
         accessControlHost.setFactory("1");
         accessControlHost.setType("6");
         ardAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(accessControlHost);
         HikClientUtil.loginAllAccessControlHost(ardAccessHostList);
+
+        //鍚屾浠诲姟
         syncTask();
     }
 
@@ -97,7 +103,7 @@
                 alarmHost.setType("6");
                 List<ArdEquipExternal> newAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
                 //闇�瑕佹洿鏂扮殑鏁版嵁
-                 updateList = sameListWithDifferent(ardAccessHostList, newAccessHostList);
+                updateList = sameListWithDifferent(ardAccessHostList, newAccessHostList);
                 if (updateList.size() > 0) {
                     HikClientUtil.logoutAllAlarmHost(updateList);
                     HikClientUtil.loginAllAlarmHost(updateList);
@@ -125,6 +131,34 @@
                 log.error("鍚屾澶栬仈浠诲姟鎵ц鍑洪敊" + e.getMessage());
             }
         }, 10, 10, TimeUnit.SECONDS);
+    }
+
+
+    /**
+     * 鏌ヨexternal
+     *
+     * @param id external涓婚敭
+     * @return external
+     */
+    @Override
+    public ArdEquipExternal selectArdEquipExternalById(String id) {
+        return ardEquipExternalMapper.selectArdEquipExternalById(id);
+    }
+
+    @Override
+    public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
+        return ardEquipExternalMapper.selectArdEquipExternal(ardEquipExternal);
+    }
+
+    /**
+     * 鏌ヨexternal鍒楄〃
+     *
+     * @param ardEquipExternal external
+     * @return external
+     */
+    @Override
+    public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal) {
+        return ardEquipExternalMapper.selectArdEquipExternalList(ardEquipExternal);
     }
 
 
@@ -157,33 +191,4 @@
                 .collect(Collectors.toList());
         return resultList;
     }
-
-    /**
-     * 鏌ヨexternal
-     *
-     * @param id external涓婚敭
-     * @return external
-     */
-    @Override
-    public ArdEquipExternal selectArdEquipExternalById(String id) {
-        return ardEquipExternalMapper.selectArdEquipExternalById(id);
-    }
-
-    @Override
-    public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
-        return ardEquipExternalMapper.selectArdEquipExternal(ardEquipExternal);
-    }
-
-    /**
-     * 鏌ヨexternal鍒楄〃
-     *
-     * @param ardEquipExternal external
-     * @return external
-     */
-    @Override
-    public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal) {
-        return ardEquipExternalMapper.selectArdEquipExternalList(ardEquipExternal);
-    }
-
-
 }

--
Gitblit v1.9.3