From 4ddfd502023662f6d25c4be416d88751e206d91a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 十月 2022 09:45:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/ScheduleService.java | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/ScheduleService.java b/src/main/java/com/lf/server/service/all/ScheduleService.java
index 03399cc..7f430f8 100644
--- a/src/main/java/com/lf/server/service/all/ScheduleService.java
+++ b/src/main/java/com/lf/server/service/all/ScheduleService.java
@@ -53,9 +53,6 @@
/**
* 鏌ヨ鏈嶅姟鍣ㄧ姸鎬�
- *
- * @return
- * @throws InterruptedException
*/
public JSONObject selectServerStatus() throws InterruptedException {
JSONObject json = new JSONObject();
@@ -67,9 +64,6 @@
/**
* 鏌ヨCpu淇℃伅
- *
- * @return
- * @throws InterruptedException
*/
public JSONObject selectCpuInfo() throws InterruptedException {
SystemInfo systemInfo = new SystemInfo();
@@ -101,8 +95,6 @@
/**
* 鏌ヨ鍐呭瓨淇℃伅
- *
- * @return
*/
public JSONObject selectMemInfo() {
JSONObject map = new JSONObject();
@@ -124,8 +116,6 @@
/**
* 鏌ヨ鍦ㄧ嚎鐢ㄦ埛
- *
- * @return
*/
public List<JSONObject> selectOnlineUsers() {
List<JSONObject> list = new ArrayList<JSONObject>();
@@ -133,7 +123,7 @@
Set<String> keys = redisTemplate.keys(RedisCacheKey.signUserKey("*"));
for (String key : keys) {
Object obj = redisTemplate.opsForValue().get(key);
- if (obj != null && obj instanceof UserEntity) {
+ if (obj instanceof UserEntity) {
UserEntity ue = (UserEntity) obj;
JSONObject map = new JSONObject();
@@ -150,8 +140,6 @@
/**
* 鏌ヨ鏈嶅姟璧勬簮鐘舵��
- *
- * @return
*/
public List<ResEntity> selectResStatus() {
List<ResEntity> resList = resService.selectResAll();
@@ -191,8 +179,6 @@
/**
* 缁熻鏈嶅姟璧勬簮鐘舵��
- *
- * @return
*/
public JSONObject countResStatus() {
List<ResEntity> resList = resService.selectResAll();
@@ -210,10 +196,7 @@
/**
* 璧勬簮鎿嶄綔鐘舵��
- *
- * @return
*/
-
public JSONObject operateCount() {
List<OperateEntity> list = operateService.operateCount();
JSONObject jsonObject = new JSONObject();
@@ -234,26 +217,23 @@
/**
* 鐢ㄦ埛鐧诲綍鐘舵��
- *
- * @return
*/
-
public JSONObject userLoginCount() {
List<LoginEntity> list = loginService.selectLoginCounts();
- JSONObject jsonObject = new JSONObject();
- if (list.isEmpty()) {
+ if (list == null || list.isEmpty()) {
return null;
- } else {
- List<JSONObject> lister = new ArrayList<JSONObject>();
- for (LoginEntity key : list) {
- JSONObject map = new JSONObject();
- map.put("count", key.getCount());
- map.put("optime", key.getOptime());
- lister.add(map);
- }
- jsonObject.put("userLoginCount", lister);
- return jsonObject;
}
- }
+ JSONObject jsonObject = new JSONObject();
+ List<JSONObject> lister = new ArrayList<JSONObject>();
+ for (LoginEntity key : list) {
+ JSONObject map = new JSONObject();
+ map.put("count", key.getCount());
+ map.put("optime", key.getOptime());
+ lister.add(map);
+ }
+ jsonObject.put("userLoginCount", lister);
+
+ return jsonObject;
+ }
}
--
Gitblit v1.9.3