From 6d1540258545a41fcbaa50c43b3480a22896d03e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:23:20 +0800
Subject: [PATCH] 点位在线定时任务卡死修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java | 1 +
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java
index 5f39dbe..20a68a7 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java
@@ -18,6 +18,7 @@
private String ip;
/** 鏈�杩戠洃娴嬪湪绾跨姸鎬� */
private Boolean online;
+ private String onlineStr;
/** 褰撴棩鐩戞祴娆℃暟 */
private Integer checkCount;
/** 褰撴棩绂荤嚎 */
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 2e7fe8a..763e007 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -73,7 +73,13 @@
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
params.setDeptTag(-1);
params.setDeviceType(1);
// 缁熻璁惧鏁伴噺
@@ -110,7 +116,13 @@
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
// 缁熻璁惧鏁伴噺
params.setDeptTag(1);
params.setDeviceType(1);
@@ -152,7 +164,13 @@
params.setDeviceType(1);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeySiteOnline)
@@ -190,7 +208,13 @@
params.setDeviceType(1);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyCommandImageOnline)
@@ -894,7 +918,13 @@
params.setDeviceType(2);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getSiteOnline)
@@ -1391,7 +1421,13 @@
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-
+ resultList.forEach(item->{
+ if(null != item.getOnline() && item.getOnline()){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else {
+ item.setOnlineStr("绂荤嚎");
+ }
+ });
params.setDeptTag(-1);
params.setDeviceType(3);
// 缁熻璁惧鏁伴噺
--
Gitblit v1.8.0