From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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 0385f2c..a653ef3 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
@@ -62,9 +62,20 @@
long total = mongoTemplate.count(query, VideoOnlineResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
- long count = mongoTemplate.count(new Query(), VideoOnlineResult.class);
+
+ // 缁熻
+ Criteria criteriaCount = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteriaCount.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ Query countQuery = new Query();
+ countQuery.addCriteria(criteriaCount);
+ long count = mongoTemplate.count(countQuery, VideoOnlineResult.class);
HashMap<String, Object> map = new HashMap<>();
- map.put("total", count);
+ map.put("count", Arrays.asList(count));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
--
Gitblit v1.8.0