From 8f889738db488b852b5a475af1819b1803a7c074 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 21 十月 2024 11:49:46 +0800
Subject: [PATCH] 数据中心时间搜索改成某天
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java | 12 ++++++------
ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java | 11 ++++++++---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 7 +++----
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
index 5019600..8e87c8e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
@@ -17,13 +17,13 @@
*/
@Data
public class DataCenterQuery extends AbsQuery {
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date date;
/** 寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date startTime;
/** 缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date endTime;
/** 鍏抽敭璇� */
@@ -43,11 +43,11 @@
public void setTime() {
- if (Objects.nonNull(this.startTime)) {
- this.startTime = DateUtils.getDayStart(this.startTime);
+ if (Objects.nonNull(this.date)) {
+ this.startTime = DateUtils.getDayStart(this.date);
}
- if (Objects.nonNull(this.endTime)) {
- this.endTime = DateUtils.getDayEnd(this.endTime);
+ if (Objects.nonNull(this.date)) {
+ this.endTime = DateUtils.getDayEnd(this.date);
}
}
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 f97323d..7c0f34a 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
@@ -69,6 +69,7 @@
public Result videoPointOnlineRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("name", "no", "ip");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ System.out.println("鏌ヨ鏉′欢"+query.toString());
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -92,10 +93,9 @@
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
- Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getSiteOnline)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -142,11 +142,10 @@
params.setDeviceType(1);
Integer distinctCount = pointMapper.distinctCount(params);
- Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMinistrySiteOnline)
.eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
diff --git a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
index 3237613..a3fbf48 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -149,15 +149,20 @@
String status = "";
if (! webReachable) {
status += "璁惧web璁块棶澶辫触锛�";
+ }else if(webReachable){
+ status += "璁惧web璁块棶姝ｅ父锛�";
}
+
if (! pingReachable) {
status += "璁惧ip鏈猵ing閫氾紱";
+ }else if(pingReachable){
+ status += "璁惧ipPing姝ｅ父锛�";
}
+
if (StringUtils.isEmpty(imgUrl)) {
status += "鏈幏鍙栧埌鍥剧墖";
- }
- if (StringUtils.isEmpty(status)) {
- status += "璁惧姝ｅ父";
+ }else {
+ status += "鑾峰彇鍥剧墖姝ｅ父";
}
result.setStatus(status);
return result;
--
Gitblit v1.8.0