diff --git a/html/monitor.html b/html/monitor.html
index c1bcc86..60ba0af 100644
--- a/html/monitor.html
+++ b/html/monitor.html
@@ -33,12 +33,12 @@
.resu {
margin-left: 360px;
- width: 1160px;
+ width: 1152px;
min-height: 700px;
}
.line {
- width: 1100px;
+ width: 1152px;
height: 300px;
}
@@ -97,11 +97,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -307,7 +307,7 @@
},
async groupData() {
let groupData = await API.groupData(this.query.host, this.query);
- // groupData = groupData.filter(data => data.interfaceName && data.interfaceName.indexOf('/admin/monitor') === -1);
+ groupData = groupData.filter(data => data.interfaceName && data.interfaceName.indexOf('/admin/monitor') === -1);
this.data.groupData = groupData;
this.data.showLine = false;
this.data.showTable = true;
@@ -324,14 +324,6 @@
this.init();
},
watch: {
- // 'query.host': async function (newVal) {
- // if (this.interval) {
- // clearTimeout(this.interval)
- // }
- // this.interval = setTimeout(async () => {
- // this.init();
- // }, 100);
- // },
},
});
diff --git a/src/main/java/com/syzb/common/config/cache/CacheConfig.java b/src/main/java/com/syzb/common/config/cache/CacheConfig.java
index da6ce45..b865f47 100644
--- a/src/main/java/com/syzb/common/config/cache/CacheConfig.java
+++ b/src/main/java/com/syzb/common/config/cache/CacheConfig.java
@@ -68,8 +68,8 @@ public class CacheConfig {
configMap.put(GROUP, new LocalMapConfig(10000, 300));
configMap.put(WX_USER, new LocalMapConfig(10000, 3600));
- configMap.put(VIDEO_ONLINE_USER, new LocalMapConfig(1000000, 604800, InMemoryFormat.OBJECT));
- configMap.put(GROUP_ONLINE_USER, new LocalMapConfig(1000000, 604800, InMemoryFormat.OBJECT));
+ configMap.put(VIDEO_ONLINE_USER, new LocalMapConfig(1000000, 172800, InMemoryFormat.OBJECT));
+ configMap.put(GROUP_ONLINE_USER, new LocalMapConfig(1000000, 172800, InMemoryFormat.OBJECT));
return configMap;
}
diff --git a/src/main/java/com/syzb/common/service/OnlineUserService.java b/src/main/java/com/syzb/common/service/OnlineUserService.java
index de1fc6c..09f9d90 100644
--- a/src/main/java/com/syzb/common/service/OnlineUserService.java
+++ b/src/main/java/com/syzb/common/service/OnlineUserService.java
@@ -58,7 +58,7 @@ public class OnlineUserService {
public Set getOnlineUserIds(Integer productType, Integer productId) {
String cacheName = getOnlineCacheName(productType);
- String sql = "SELECT distinct userId FROM " + cacheName + " WHERE productId = " + productId;
+ String sql = "SELECT distinct userId FROM " + cacheName + " WHERE productId = " + productId + " and isOnline = 1";
SqlResult result = hazelcastInstance.getSql().execute(sql);
Set set = new HashSet<>();
for (SqlRow row : result) {
diff --git a/src/main/java/com/syzb/monitor/service/MonitorService.java b/src/main/java/com/syzb/monitor/service/MonitorService.java
index 7e82f12..8765710 100644
--- a/src/main/java/com/syzb/monitor/service/MonitorService.java
+++ b/src/main/java/com/syzb/monitor/service/MonitorService.java
@@ -7,8 +7,6 @@ import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
import com.hazelcast.core.HazelcastInstance;
import com.syzb.common.handler.BizException;
import com.syzb.common.result.ResponseStatus;
@@ -22,7 +20,10 @@ import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;