From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java b/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
index 13ec692..9bc8626 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SystemInfoTimerTask.java
@@ -1,11 +1,15 @@
package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd.AlarmQueryMessageHandler;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.SystemInfoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.List;
import java.util.Map;
/**
@@ -14,20 +18,24 @@
@Component
public class SystemInfoTimerTask {
+ private Logger logger = LoggerFactory.getLogger(SystemInfoTimerTask.class);
+
@Autowired
private IRedisCatchStorage redisCatchStorage;
- @Scheduled(fixedRate = 1000) //姣�1绉掓墽琛屼竴娆�
+ @Scheduled(fixedRate = 2000) //姣�1绉掓墽琛屼竴娆�
public void execute(){
try {
double cpuInfo = SystemInfoUtils.getCpuInfo();
redisCatchStorage.addCpuInfo(cpuInfo);
double memInfo = SystemInfoUtils.getMemInfo();
redisCatchStorage.addMemInfo(memInfo);
- Map<String, String> networkInterfaces = SystemInfoUtils.getNetworkInterfaces();
+ Map<String, Double> networkInterfaces = SystemInfoUtils.getNetworkInterfaces();
redisCatchStorage.addNetInfo(networkInterfaces);
+ List<Map<String, Object>> diskInfo =SystemInfoUtils.getDiskInfo();
+ redisCatchStorage.addDiskInfo(diskInfo);
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.error("[鑾峰彇绯荤粺淇℃伅澶辫触] {}", e.getMessage());
}
}
--
Gitblit v1.8.0