From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/utils/MongoUtil.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
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 316516c..dfff3aa 100644
--- a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -28,12 +28,11 @@
* 鏋勯�犳暟鎹腑蹇冩悳绱㈢殑鏉′欢
*
* @param params 鏁版嵁涓績璇锋眰鍙傛暟
- * @param gbFiled 鍥芥爣鐮佸瓧娈垫槸鍝竴涓�
* @param timeFiled 鏃堕棿瀛楁鏄摢涓�涓�
- * @param gbList 鍥芥爣鐮�
+ * @param dataAuth 鐐逛綅绫诲瀷锛歯ull 鎵�鏈� 1 閮ㄧ骇 2 鐪佸巺 3 閲嶇偣 4 閲嶇偣鎸囨尌 5 鏄惁鏂拌澶�
* @param likeFileds 浣跨敤like鏌ヨ鐨勫瓧娈�
*/
- public static Query getQuery(DataCenterQuery params, String gbFiled, String timeFiled, List<String> likeFileds, List<String> gbList) {
+ public static Query getQuery(DataCenterQuery params, String timeFiled, List<String> likeFileds, Integer dataAuth) {
// 鍏抽敭瀛�
List<Criteria> likeList = null;
if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
@@ -50,10 +49,28 @@
or.orOperator(likeList);
}
- Criteria in = null;
+ Criteria tag = null;
// in
- if (! CollectionUtils.isEmpty(gbList)) {
- in = Criteria.where(gbFiled).in(gbList);
+ if (Objects.nonNull(dataAuth)) {
+ switch (dataAuth) {
+ case 1:
+ tag = Criteria.where("deptTag").is(Boolean.TRUE);
+ break;
+ case 2:
+ tag = Criteria.where("provinceTag").is(Boolean.TRUE);
+ break;
+ case 3:
+ tag = Criteria.where("importantTag").is(Boolean.TRUE);
+ break;
+ case 4:
+ tag = Criteria.where("importantCommandImageTag").is(Boolean.TRUE);
+ break;
+ case 5:
+ tag = Criteria.where("newDevice").is(Boolean.TRUE);
+ break;
+ default:
+ break;
+ }
}
// 鏃堕棿
@@ -63,8 +80,8 @@
Criteria and = new Criteria();
List<Criteria> qList = new ArrayList<>(3);
qList.add(time);
- if (Objects.nonNull(in)) {
- qList.add(in);
+ if (Objects.nonNull(tag)) {
+ qList.add(tag);
}
if (Objects.nonNull(or)) {
qList.add(or);
--
Gitblit v1.8.0