From 14663e5f2371b4007c6bc310d884a60533a88a27 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 24 十月 2022 14:42:02 +0800
Subject: [PATCH] 1
---
data/项目实施计划（融合）v03.xlsx | 0
src/main/java/com/lf/server/service/all/ScheduleService.java | 29 ++++++++++++++++++++++++++---
src/main/java/com/lf/server/config/ScheduleConfig.java | 6 +++---
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git "a/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx" "b/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx"
index d8e13ab..2c720ec 100644
--- "a/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx"
+++ "b/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx"
Binary files differ
diff --git a/src/main/java/com/lf/server/config/ScheduleConfig.java b/src/main/java/com/lf/server/config/ScheduleConfig.java
index 1c523d5..27cc2ff 100644
--- a/src/main/java/com/lf/server/config/ScheduleConfig.java
+++ b/src/main/java/com/lf/server/config/ScheduleConfig.java
@@ -65,8 +65,8 @@
try {
JSONObject jsonObject = new JSONObject();
- // 鏈嶅姟浣跨敤鐘舵�� sys_res
- // jsonObject.put("resUseCount", scheduleService.resUseCount());
+ // 鏈嶅姟璧勬簮鐘舵�� sys_res
+ jsonObject.put("resUseCount", scheduleService.countResStatus());
// 鐢ㄦ埛鐧诲綍鐘舵�� sys_login
// jsonObject.put("userLoginCount", scheduleService.userLoginCount());
@@ -74,7 +74,7 @@
// 璧勬簮鎿嶄綔鐘舵�� sys_operate
// jsonObject.put("operateCount", scheduleService.operateCount());
- // 璧勬簮璋冪敤缁熻
+ // 璧勬簮璋冪敤鐘舵��
String json = JSONObject.toJSONStringWithDateFormat(jsonObject, "yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteMapNullValue);
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 5db8120..592514f 100644
--- a/src/main/java/com/lf/server/service/all/ScheduleService.java
+++ b/src/main/java/com/lf/server/service/all/ScheduleService.java
@@ -144,13 +144,17 @@
* @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())){
+ if (StringHelper.isEmpty(re.getServer())) {
list.add(re);
continue;
}
@@ -174,4 +178,23 @@
return list;
}
+
+ /**
+ * 缁熻鏈嶅姟璧勬簮鐘舵��
+ *
+ * @return
+ */
+ 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;
+ }
}
--
Gitblit v1.9.3