From a2c56bd6b79d2b8ca2c4c44a254ad2958fb72bca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 九月 2021 15:21:45 +0800
Subject: [PATCH] 推送服务完善
---
service-push/src/main/java/com/ks/push/dao/BPushTaskDao.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/service-push/src/main/java/com/ks/push/dao/BPushTaskDao.java b/service-push/src/main/java/com/ks/push/dao/BPushTaskDao.java
index b69d27d..fdb5591 100644
--- a/service-push/src/main/java/com/ks/push/dao/BPushTaskDao.java
+++ b/service-push/src/main/java/com/ks/push/dao/BPushTaskDao.java
@@ -3,6 +3,7 @@
import com.ks.push.pojo.DO.BPushTask;
import com.ks.lib.common.dao.MongodbBaseDao;
import com.ks.push.pojo.Query.BPushTaskQuery;
+import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
@@ -55,6 +56,15 @@
andList.add(Criteria.where("message.title").regex(daoQuery.messageTitle));
}
+ if (daoQuery.minStartPushTime != null) {
+ andList.add(Criteria.where("filter.startPushTime").gte(daoQuery.minStartPushTime));
+ }
+
+ if (daoQuery.maxStartPushTime != null) {
+ andList.add(Criteria.where("filter.startPushTime").lt(daoQuery.maxStartPushTime));
+ }
+
+
Query query = new Query();
if (andList.size() > 0) {
Criteria[] ands = new Criteria[andList.size()];
@@ -69,6 +79,9 @@
Query query = getQuery(daoQuery);
query.skip(start);
query.limit(count);
+ if (daoQuery.sortList != null) {
+ query.with(Sort.by(daoQuery.sortList));
+ }
return findList(query);
}
--
Gitblit v1.8.0