From d6e5a42f021b5e2612f970da21cccf386a4e6640 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 18:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 6 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 1
ycl-server/src/main/java/com/ycl/utils/MongoUtil.java | 29 +++++++--
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 126 +++++++++++++++++++++--------------------
5 files changed, 98 insertions(+), 69 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
index 1bc167e..87a0eb0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
@@ -2,6 +2,7 @@
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
@Data
@@ -18,6 +19,7 @@
/**
* IP鍦板潃
*/
+ @TextIndexed
private QualifyResult ip;
/**
* 鐩戞帶鐐逛綅绫诲瀷
@@ -38,6 +40,7 @@
/**
* 璁惧鍚�
*/
+ @TextIndexed
private QualifyResult name;
/**
* 璁惧鐘舵��
@@ -46,6 +49,7 @@
/**
* 璁惧缂栫爜
*/
+ @TextIndexed
private QualifyResult serialNumber;
/**
* 鎽勫儚鏈洪噰闆嗗尯鍩�
@@ -70,10 +74,12 @@
/**
* 灞曠ず鍊�
* */
+ @TextIndexed
private String showValue;
/**
* 鏁版嵁鍘熷鍊硷紝濡傚浗鏍囩爜绛�
*/
+ @TextIndexed
private String value;
}
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index 74a0033..f2caa67 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
@@ -20,12 +21,14 @@
/**
* 鍥芥爣鐮�
*/
+ @TextIndexed
private String deviceNo;
/**
* 鎽勫儚鏈哄搧鐗�
*/
private Integer deviceBrand;
+
/**
* 璁惧绫诲瀷
*/
@@ -34,6 +37,7 @@
/**
* ip
*/
+ @TextIndexed
private String ip;
/**
@@ -51,6 +55,7 @@
/**
* osd閫氶亾鍚�
*/
+ @TextIndexed
private String osdName;
/**
* osd鐪�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index be732c7..a07c5c9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -38,6 +38,7 @@
/**
* 鎽勫儚鏈篒D
*/
+ @TextIndexed
private String deviceId;
/**
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 0f70896..f40c430 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
@@ -57,7 +57,8 @@
@Override
public Result videoPointOnlineRate(DataCenterQuery params) {
// 鐢熸垚鏌ヨ
- Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
// 鍏堟煡鎬绘暟鍐嶅垎椤�
long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -85,9 +86,9 @@
public Result deptVideoPointOnlineRate(DataCenterQuery params) {
// 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(0);
-
+ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
// 鐢熸垚鏌ヨ
- Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
// 鍏堟煡鎬绘暟鍐嶅垎椤�
long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -130,8 +131,8 @@
public Result videoImportantPointOnlineRate(DataCenterQuery params) {
// 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
- Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
long total = mongoTemplate.count(query, VideoOnlineResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -177,8 +178,8 @@
public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
// 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(2);
-
- Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
long total = mongoTemplate.count(query, VideoOnlineResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -223,8 +224,8 @@
*/
@Override
public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -272,8 +273,8 @@
*/
@Override
public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -322,7 +323,8 @@
@Override
public Result videoAssessmentFileRatio(DataCenterQuery params) {
// TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
- Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -370,8 +372,8 @@
*/
@Override
public Result videoAvailabilityRate(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "deviceId", "createTime", null);
+ List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -417,8 +419,8 @@
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
List<String> deptGBList = pointMapper.getDeptPointGB(0);
-
- Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+ List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -467,8 +469,8 @@
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
- Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+ List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -514,8 +516,8 @@
*/
@Override
public Result videoLabelingAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -541,7 +543,8 @@
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
List<String> deptGBList = pointMapper.getDeptPointGB(1);
- Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
+ List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+ Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -590,7 +593,8 @@
@Override
public Result videoCheckTimeAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ List<String> likeFileds = Arrays.asList("deviceId");
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, OneMachineFileResult.class);
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
@@ -616,8 +620,8 @@
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
- Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
+ List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+ Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -663,8 +667,8 @@
*/
@Override
public Result vehicleViewDockStable(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -711,8 +715,8 @@
*/
@Override
public Result vehiclePointOnlineRate(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -737,8 +741,8 @@
*/
@Override
public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -786,8 +790,8 @@
*/
@Override
public Result vehicleCollectionConsistency(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, CrossDetailResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -835,8 +839,8 @@
*/
@Override
public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -860,8 +864,8 @@
*/
@Override
public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -881,8 +885,8 @@
*/
@Override
public Result vehicleClockAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -930,8 +934,8 @@
*/
@Override
public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -951,8 +955,8 @@
*/
@Override
public Result vehicleUrlAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, PicAccessResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -972,8 +976,8 @@
*/
@Override
public Result vehicleBigImgAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, new ArrayList<>());
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -993,8 +997,8 @@
*/
@Override
public Result faceViewDockStable(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1041,8 +1045,8 @@
*/
@Override
public Result facePointOnlineRate(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1089,14 +1093,14 @@
*/
@Override
public Result faceDirectoryConsistency(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
-// 缁熻鏁伴噺
+ // 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
@@ -1138,8 +1142,8 @@
*/
@Override
public Result faceCollectionConsistency(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, CrossDetailResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1187,8 +1191,8 @@
*/
@Override
public Result faceImgQualification(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, MonitoringDetailResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1236,8 +1240,8 @@
*/
@Override
public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1284,8 +1288,8 @@
*/
@Override
public Result faceTimelyUpload(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1332,8 +1336,8 @@
*/
@Override
public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
-
- Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+ List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
diff --git a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
index 0089c62..316516c 100644
--- a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -13,6 +13,8 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
/**
* mongo宸ュ叿绫�
@@ -29,12 +31,23 @@
* @param gbFiled 鍥芥爣鐮佸瓧娈垫槸鍝竴涓�
* @param timeFiled 鏃堕棿瀛楁鏄摢涓�涓�
* @param gbList 鍥芥爣鐮�
+ * @param likeFileds 浣跨敤like鏌ヨ鐨勫瓧娈�
*/
- public static Query getQuery(DataCenterQuery params, String gbFiled, String timeFiled, List<String> gbList) {
+ public static Query getQuery(DataCenterQuery params, String gbFiled, String timeFiled, List<String> likeFileds, List<String> gbList) {
// 鍏抽敭瀛�
- TextCriteria text = null;
- if (StringUtils.hasText(params.getKeyword())) {
- text = TextCriteria.forDefaultLanguage().matching(params.getKeyword());
+ List<Criteria> likeList = null;
+ if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
+ // 杞箟
+ String keyword = Pattern.quote(params.getKeyword());
+ likeList = likeFileds.stream().map(filed -> {
+ return Criteria.where(filed).regex(".*?" + keyword + ".*");
+ }).collect(Collectors.toList());
+ }
+ // 灏唋ike瀛楁or璧锋潵
+ Criteria or = null;
+ if (! CollectionUtils.isEmpty(likeList)) {
+ or = new Criteria();
+ or.orOperator(likeList);
}
Criteria in = null;
@@ -49,13 +62,13 @@
// 灏嗘煡璇㈡潯浠禷nd璧锋潵
Criteria and = new Criteria();
List<Criteria> qList = new ArrayList<>(3);
- if (Objects.nonNull(text)) {
- qList.add(Criteria.byExample(text));
- }
+ qList.add(time);
if (Objects.nonNull(in)) {
qList.add(in);
}
- qList.add(time);
+ if (Objects.nonNull(or)) {
+ qList.add(or);
+ }
and.andOperator(qList);
// 杩斿洖鏌ヨ
return Query.query(and);
--
Gitblit v1.8.0