From 913d47be5fa05c33a958a00b9a85126d817e3f06 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 31 十月 2024 15:09:48 +0800
Subject: [PATCH] 首页点位在线折线bug

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 713fc0b..5968f2b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -456,9 +456,10 @@
                 List<TMonitorResult> onlines = onlineList.stream().filter(tMonitorResult -> tMonitorResult.getMongoCreateTime().minusDays(1).equals(parseTime)).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(onlines)) {
                     videoExp.setTotal(onlines.size());
-                    videoExp.setOnline(Integer.valueOf(onlines.stream()
-                            .filter(TMonitorResult::getPingOnline)
-                            .count() + ""));
+                    long count = onlines.stream()
+                            .filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
+                            .count();
+                    videoExp.setOnline(Integer.valueOf(count+""));
                     videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
                 }
                 //璁剧疆瀛樺偍鎯呭喌
@@ -809,7 +810,7 @@
                 new Document("$group", new Document("_id", "$mongoCreateTime")
                         .append("onlineCount", new Document("$sum",
                                 new Document("$cond", Arrays.asList(
-                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+                                        new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
                                         1,
                                         0
                                 ))
@@ -911,7 +912,7 @@
                 new Document("$group", new Document("_id", "$mongoCreateTime")
                         .append("onlineCount", new Document("$sum",
                                 new Document("$cond", Arrays.asList(
-                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+                                        new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
                                         1,
                                         0
                                 ))
@@ -1022,7 +1023,7 @@
                 new Document("$group", new Document("_id", "$mongoCreateTime")
                         .append("onlineCount", new Document("$sum",
                                 new Document("$cond", Arrays.asList(
-                                        new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+                                        new Document("$eq", Arrays.asList("$online", ApiConstants.UY_OnlineSite_Online)),
                                         1,
                                         0
                                 ))
@@ -1099,7 +1100,13 @@
         for (TMonitorResult monitorResult : onlineResult) {
             int dayOfMonth = monitorResult.getMongoCreateTime().getDayOfMonth();
             String online = "";
-            online += monitorResult.getPingOnline() ? "鍦ㄧ嚎" : "绂荤嚎";
+            if(ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())){
+                online +="鍦ㄧ嚎";
+            }else if(ApiConstants.UY_OnlineSite_Offline.equals(monitorResult.getOnline())){
+                online +="绂荤嚎";
+            }else {
+                online +="鏈煡";
+            }
             //鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3...
             Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth);
             field.setAccessible(true);

--
Gitblit v1.8.0