From 3ffe2050827482ba83a1c15afbf346275be86187 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 20 十月 2022 18:03:40 +0800
Subject: [PATCH] 首页改造,完成cpu,内存,网络图
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index f411881..6178a3b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.SystemInfoDto;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
@@ -694,12 +695,12 @@
@Override
public void addCpuInfo(double cpuInfo) {
String key = VideoManagerConstants.SYSTEM_INFO_CPU_PREFIX + userSetting.getServerId();
- SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
- systemInfoDto.setTime(DateUtil.getNow());
- systemInfoDto.setData(cpuInfo);
- RedisUtil.lSet(key, systemInfoDto);
+ Map<String, String> infoMap = new HashMap<>();
+ infoMap.put("time", DateUtil.getNow());
+ infoMap.put("data", cpuInfo + "");
+ RedisUtil.lSet(key, infoMap);
// 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
- if (RedisUtil.lGetListSize(key) > 30) {
+ if (RedisUtil.lGetListSize(key) >= 30) {
for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
RedisUtil.lLeftPop(key);
}
@@ -709,12 +710,12 @@
@Override
public void addMemInfo(double memInfo) {
String key = VideoManagerConstants.SYSTEM_INFO_MEM_PREFIX + userSetting.getServerId();
- SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
- systemInfoDto.setTime(DateUtil.getNow());
- systemInfoDto.setData(memInfo);
- RedisUtil.lSet(key, systemInfoDto);
+ Map<String, String> infoMap = new HashMap<>();
+ infoMap.put("time", DateUtil.getNow());
+ infoMap.put("data", memInfo + "");
+ RedisUtil.lSet(key, infoMap);
// 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
- if (RedisUtil.lGetListSize(key) > 30) {
+ if (RedisUtil.lGetListSize(key) >= 30) {
for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
RedisUtil.lLeftPop(key);
}
@@ -722,14 +723,16 @@
}
@Override
- public void addNetInfo(Map<String, String> networkInterfaces) {
+ public void addNetInfo(Map<String, Double> networkInterfaces) {
String key = VideoManagerConstants.SYSTEM_INFO_NET_PREFIX + userSetting.getServerId();
- SystemInfoDto<Map<String, String>> systemInfoDto = new SystemInfoDto<>();
- systemInfoDto.setTime(DateUtil.getNow());
- systemInfoDto.setData(networkInterfaces);
- RedisUtil.lSet(key, systemInfoDto);
+ Map<String, Object> infoMap = new HashMap<>();
+ infoMap.put("time", DateUtil.getNow());
+ for (String netKey : networkInterfaces.keySet()) {
+ infoMap.put(netKey, networkInterfaces.get(netKey));
+ }
+ RedisUtil.lSet(key, infoMap);
// 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
- if (RedisUtil.lGetListSize(key) > 30) {
+ if (RedisUtil.lGetListSize(key) >= 30) {
for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
RedisUtil.lLeftPop(key);
}
@@ -737,6 +740,18 @@
}
@Override
+ public SystemAllInfo getSystemInfo() {
+ String cpuKey = VideoManagerConstants.SYSTEM_INFO_CPU_PREFIX + userSetting.getServerId();
+ String memKey = VideoManagerConstants.SYSTEM_INFO_MEM_PREFIX + userSetting.getServerId();
+ String netKey = VideoManagerConstants.SYSTEM_INFO_NET_PREFIX + userSetting.getServerId();
+ SystemAllInfo systemAllInfo = new SystemAllInfo();
+ systemAllInfo.setCpu(RedisUtil.lGet(cpuKey, 0, -1));
+ systemAllInfo.setMem(RedisUtil.lGet(memKey, 0, -1));
+ systemAllInfo.setNet(RedisUtil.lGet(netKey, 0, -1));
+ return systemAllInfo;
+ }
+
+ @Override
public void sendMobilePositionMsg(JSONObject jsonObject) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
logger.info("[redis鍙戦�侀�氱煡] 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
--
Gitblit v1.8.0