感知设备心跳

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);