From ad134f2b7d95b70eb262884fa1260f37e2d744e5 Mon Sep 17 00:00:00 2001
From: Angel <1050374295@qq.com>
Date: Mon, 22 Jan 2024 16:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E8=AE=BE=E5=A4=87=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysqloracletest/task/DevopeDeviceTask.java  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java
index 8ba5963..2975db0 100644
--- a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java
+++ b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java
@@ -45,25 +45,10 @@ public class DevopeDeviceTask {
             Page<TJksbglMysql> page = new Page<>(1, 1000);
             List<TJksbglMysql> resultList = jksbglMysqlService.page(page, queryWrapper).getRecords();
 
-//            CountDownLatch latch = new CountDownLatch(resultList.size());
-//            ExecutorService DevicePool = Executors.newFixedThreadPool(5);
-
             for (TJksbglMysql bean : resultList) {
-//                DevicePool.submit(() -> {
                     cleanJksbInfo(bean);
                     logger.info("清洗完成");
-//                    latch.countDown();
-//                });
             }
-
-//            try {
-//                //Wait for all threads to complete
-//                latch.await();
-//            } catch (InterruptedException e) {
-//                e.printStackTrace();
-//            }
-//            //关闭线程池
-//            DevicePool.shutdown();
         } catch (Exception e) {
             logger.info(StringKit.getTrace(e));
         }
@@ -84,7 +69,6 @@ public class DevopeDeviceTask {
             deviceStatus.setDeviceIp(jksbglMysqlCp.getIpdz());
             deviceInfo.setDeviceMac(jksbglMysqlCp.getMacdz());
             deviceInfo.setDeviceSn(jksbglMysqlCp.getId());
-            deviceStatus.setDeviceCode(jksbglMysqlCp.getId());
             if (jksbglMysqlCp.getSbdk() != null && !jksbglMysqlCp.getSbdk().isEmpty()) {
                 deviceInfo.setDevicePort(Integer.parseInt(jksbglMysqlCp.getSbdk()));
             } else {
@@ -116,6 +100,7 @@ public class DevopeDeviceTask {
             } else {
                 deviceStatus.setIsOnline(null);
             }
+            deviceStatus.setHeartbeatTime(System.currentTimeMillis()/1000);
             deviceInfo.setDeviceAddress(jksbglMysqlCp.getAzdz());
             boolean a = devopsDeviceInfoService.save(deviceInfo);
             boolean b = deviceStatusService.save(deviceStatus);