From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/all/ScheduleService.java | 126 ++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 23 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 c094c64..ec263b0 100644
--- a/src/main/java/com/lf/server/service/all/ScheduleService.java
+++ b/src/main/java/com/lf/server/service/all/ScheduleService.java
@@ -1,9 +1,14 @@
package com.lf.server.service.all;
import com.lf.server.entity.all.RedisCacheKey;
+import com.lf.server.entity.sys.LoginEntity;
+import com.lf.server.entity.sys.OperateEntity;
import com.lf.server.entity.sys.ResEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.FileHelper;
import com.lf.server.helper.StringHelper;
+import com.lf.server.service.sys.LoginService;
+import com.lf.server.service.sys.OperateService;
import com.lf.server.service.sys.ResService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,15 +41,18 @@
private ResService resService;
@Autowired
+ private LoginService loginService;
+
+ @Autowired
+ private OperateService operateService;
+
+ @Autowired
private RedisTemplate<String, Object> redisTemplate;
private static final Log log = LogFactory.getLog(ScheduleService.class);
/**
* 鏌ヨ鏈嶅姟鍣ㄧ姸鎬�
- *
- * @return
- * @throws InterruptedException
*/
public JSONObject selectServerStatus() throws InterruptedException {
JSONObject json = new JSONObject();
@@ -56,9 +64,6 @@
/**
* 鏌ヨCpu淇℃伅
- *
- * @return
- * @throws InterruptedException
*/
public JSONObject selectCpuInfo() throws InterruptedException {
SystemInfo systemInfo = new SystemInfo();
@@ -90,8 +95,6 @@
/**
* 鏌ヨ鍐呭瓨淇℃伅
- *
- * @return
*/
public JSONObject selectMemInfo() {
JSONObject map = new JSONObject();
@@ -103,9 +106,9 @@
// 鍓╀綑
long surplusByte = memory.getAvailable();
- map.put("totalMem", StringHelper.formatByte(totalByte));
- map.put("use", StringHelper.formatByte(totalByte - surplusByte));
- map.put("remainMem", StringHelper.formatByte(surplusByte));
+ map.put("totalMem", FileHelper.formatByte(totalByte));
+ map.put("use", FileHelper.formatByte(totalByte - surplusByte));
+ map.put("remainMem", FileHelper.formatByte(surplusByte));
map.put("usage", new DecimalFormat("#.##%").format((totalByte - surplusByte) * 1.0 / totalByte));
return map;
@@ -113,8 +116,6 @@
/**
* 鏌ヨ鍦ㄧ嚎鐢ㄦ埛
- *
- * @return
*/
public List<JSONObject> selectOnlineUsers() {
List<JSONObject> list = new ArrayList<JSONObject>();
@@ -122,8 +123,8 @@
Set<String> keys = redisTemplate.keys(RedisCacheKey.signUserKey("*"));
for (String key : keys) {
Object obj = redisTemplate.opsForValue().get(key);
- if (obj != null && obj instanceof UsersEntity) {
- UsersEntity ue = (UsersEntity) obj;
+ if (obj instanceof UserEntity) {
+ UserEntity ue = (UserEntity) obj;
JSONObject map = new JSONObject();
map.put("uid", ue.getUid());
@@ -138,34 +139,113 @@
}
/**
+ * 缁熻鍦ㄧ嚎鐢ㄦ埛鏁�
+ */
+ public int countOnlineUsers() {
+ Set<String> keys = redisTemplate.keys(RedisCacheKey.signUserKey("*"));
+
+ return null == keys ? 0 : keys.size();
+ }
+
+ /**
* 鏌ヨ鏈嶅姟璧勬簮鐘舵��
- *
- * @return
*/
public List<ResEntity> selectResStatus() {
- List<ResEntity> list = new ArrayList<ResEntity>();
-
List<ResEntity> resList = resService.selectResAll();
+
+ return testResStatus(resList);
+ }
+
+ /**
+ * 娴嬭瘯璧勬簮鐘舵��
+ */
+ private List<ResEntity> testResStatus(List<ResEntity> resList) {
+ List<ResEntity> list = new ArrayList<ResEntity>();
for (ResEntity re : resList) {
Socket socket = new Socket();
try {
+ if (StringHelper.isEmpty(re.getServer())) {
+ list.add(re);
+ continue;
+ }
+
URI uri = new URI(re.getServer());
SocketAddress add = new InetSocketAddress(uri.getHost(), uri.getPort() == -1 ? 80 : uri.getPort());
// Ping閫氬湴鍧�
socket.connect(add, 2000);
} catch (Exception e) {
- log.error(e.getStackTrace());
+ // log.error(e.getMessage())
list.add(re);
} finally {
try {
socket.close();
- } catch (Exception e) {
- log.error(e.getStackTrace());
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
}
}
}
return list;
}
+
+ /**
+ * 缁熻鏈嶅姟璧勬簮鐘舵��
+ */
+ public JSONObject countResStatus() {
+ List<ResEntity> resList = resService.selectResAll();
+ List<ResEntity> unableList = testResStatus(resList);
+
+ JSONObject jsonObject = new JSONObject();
+
+ // 璧勬簮鍙敤
+ jsonObject.put("resAbleCount", resList.size() - unableList.size());
+ // 璧勬簮涓嶅彲鐢�
+ jsonObject.put("resUnableCount", unableList.size());
+
+ return jsonObject;
+ }
+
+ /**
+ * 璧勬簮鎿嶄綔鐘舵��
+ */
+ public JSONObject operateCount() {
+ List<OperateEntity> list = operateService.operateCount();
+ JSONObject jsonObject = new JSONObject();
+ if (list.isEmpty()) {
+ return null;
+ } else {
+ List<JSONObject> lister = new ArrayList<JSONObject>();
+ for (OperateEntity key : list) {
+ JSONObject map = new JSONObject();
+ map.put("count", key.getCount());
+ map.put("modular2", key.getModular2());
+ lister.add(map);
+ }
+ jsonObject.put("operateCount", lister);
+ return jsonObject;
+ }
+ }
+
+ /**
+ * 鐢ㄦ埛鐧诲綍鐘舵��
+ */
+ public JSONObject userLoginCount() {
+ List<LoginEntity> list = loginService.selectLoginCounts();
+ if (list == null || list.isEmpty()) {
+ return null;
+ }
+
+ 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