From d70a64df5d6f7b3b8f68436bd92df8366219981b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 19:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 421 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 345 insertions(+), 76 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 0c1c44c..b983667 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
@@ -1,20 +1,25 @@
package com.ycl.platform.service.impl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
import com.ycl.platform.domain.query.DataCenterQuery;
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.domain.result.UY.*;
+import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.service.DataCenterService;
import com.ycl.system.Result;
import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
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.stereotype.Service;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -29,7 +34,7 @@
public class DataCenterServiceImpl implements DataCenterService {
private final MongoTemplate mongoTemplate;
-
+ private final ImageResourceSecurityDetailMapper securityDetailMapper;
private final static String TIME_FIELD = "mongoCreateTime";
/**
@@ -51,10 +56,25 @@
);
}
query.addCriteria(criteria);
+ 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 total = mongoTemplate.count(query, VideoOnlineResult.class);
- return Result.ok().data(resultList).total(total);
+
+ // 缁熻
+ 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("count", Arrays.asList(count));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -76,10 +96,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -89,7 +118,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery params) {
+ public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -101,9 +130,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
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<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -113,7 +147,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery params) {
+ public Result videoAssessmentFileRatio(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -125,9 +159,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -137,7 +181,7 @@
* @return
*/
@Override
- public List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery params) {
+ public Result videoAvailabilityRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -149,9 +193,17 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), RecordMetaDSumResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), RecordMetaDSumResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), RecordMetaDSumResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -161,7 +213,7 @@
* @return
*/
@Override
- public List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery params) {
+ public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -173,9 +225,17 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), OneMachineFileResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -184,9 +244,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery params) {
+ public Result videoLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -198,9 +257,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
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<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), RecordMetaDSumResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -209,9 +278,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+ public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -223,9 +291,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OsdCheckResult.class);
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<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OsdCheckResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OsdCheckResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OsdCheckResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OsdCheckResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OsdCheckResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -234,9 +312,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery params) {
+ public Result videoCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -248,9 +325,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -259,9 +346,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
+ public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -273,9 +359,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -284,9 +380,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -298,9 +393,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -309,9 +414,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -323,9 +427,19 @@
);
}
query.addCriteria(criteria);
+ 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<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return resultList;
+ List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
@@ -338,7 +452,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery params) {
+ public Result vehicleViewDockStable(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -350,9 +464,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -362,7 +485,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery params) {
+ public Result vehiclePointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -374,9 +497,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -386,7 +518,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
+ public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -398,9 +530,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -410,7 +552,7 @@
* @return
*/
@Override
- public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery params) {
+ public Result vehicleCollectionConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -422,9 +564,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, CrossDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -434,7 +585,7 @@
* @return
*/
@Override
- public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery params) {
+ public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -446,9 +597,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -458,7 +614,7 @@
* @return
*/
@Override
- public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery params) {
+ public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -470,9 +626,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -482,7 +643,7 @@
* @return
*/
@Override
- public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery params) {
+ public Result vehicleClockAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -494,9 +655,17 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), VehicleDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), VehicleDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), VehicleDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -506,7 +675,7 @@
* @return
*/
@Override
- public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery params) {
+ public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -518,9 +687,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -530,7 +704,7 @@
* @return
*/
@Override
- public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery params) {
+ public Result vehicleUrlAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -542,9 +716,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, PicAccessResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -554,7 +733,7 @@
* @return
*/
@Override
- public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery params) {
+ public Result vehicleBigImgAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -566,9 +745,14 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -578,7 +762,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery params) {
+ public Result faceViewDockStable(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -590,9 +774,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -601,9 +794,8 @@
* @param params
* @return
*/
- // TODO 鏇存崲鍝嶅簲缁撴灉
@Override
- public List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery params) {
+ public Result facePointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -615,9 +807,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
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<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -627,7 +828,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery params) {
+ public Result faceDirectoryConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -639,9 +840,19 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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 nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -651,7 +862,7 @@
* @return
*/
@Override
- public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery params) {
+ public Result faceCollectionConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -663,9 +874,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, CrossDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -675,7 +895,7 @@
* @return
*/
@Override
- public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery params) {
+ public Result faceImgQualification(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -687,9 +907,18 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, MonitoringDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), MonitoringDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), MonitoringDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), MonitoringDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), MonitoringDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -699,7 +928,7 @@
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery params) {
+ public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -711,9 +940,17 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -723,7 +960,7 @@
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery params) {
+ public Result faceTimelyUpload(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -735,9 +972,17 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
- return resultList;
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -747,7 +992,7 @@
* @return
*/
@Override
- public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery params) {
+ public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -759,8 +1004,32 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
- return resultList;
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
+ }
+ /**
+ * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public Result videoImageResourceSecurity(DataCenterQuery query) {
+ ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
+ Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
+ securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", page);
+ return Result.ok().data(map).total(page.getTotal());
+
}
}
--
Gitblit v1.8.0