From 68e4f49cf09a133defc646f10654bbb3fe6ab487 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 12 八月 2024 16:09:49 +0800
Subject: [PATCH] 海康接口调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 9e70a0e..0c1c44c 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
@@ -4,14 +4,15 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.service.DataCenterService;
+import com.ycl.system.Result;
import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.TextCriteria;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,7 +39,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery params) {
+ public Result videoPointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -51,8 +52,9 @@
}
query.addCriteria(criteria);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return resultList;
+ List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+ long total = mongoTemplate.count(query, VideoOnlineResult.class);
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -62,7 +64,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery params) {
+ public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -76,7 +78,8 @@
query.addCriteria(criteria);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return resultList;
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
+ return Result.ok().data(resultList).total(total);
}
/**
--
Gitblit v1.8.0