From ea68e8f8c00c0178037a9f1cc6dc1663bde913b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 七月 2021 17:49:35 +0800
Subject: [PATCH] 推送服务完善
---
service-push/src/main/java/com/ks/push/dao/BPushAppInfoDao.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service-push/src/main/java/com/ks/push/dao/BPushAppInfoDao.java b/service-push/src/main/java/com/ks/push/dao/BPushAppInfoDao.java
index 16a03b8..762deb0 100644
--- a/service-push/src/main/java/com/ks/push/dao/BPushAppInfoDao.java
+++ b/service-push/src/main/java/com/ks/push/dao/BPushAppInfoDao.java
@@ -38,6 +38,10 @@
andList.add(Criteria.where("appCode").is(daoQuery.appCode));
}
+ if (daoQuery.state != null) {
+ andList.add(Criteria.where("state").is(daoQuery.state));
+ }
+
if (daoQuery.name != null) {
andList.add(Criteria.where("name").regex(daoQuery.name));
}
@@ -50,10 +54,16 @@
andList.add(Criteria.where("createTime").lt(daoQuery.maxCreateTime));
}
+ if (daoQuery.state != null) {
+ andList.add(Criteria.where("state").is(daoQuery.state));
+ }
+
Criteria[] ands = new Criteria[andList.size()];
andList.toArray(ands);
Query query = new Query();
- query.addCriteria(new Criteria().andOperator(ands));
+ if (ands.length > 0) {
+ query.addCriteria(new Criteria().andOperator(ands));
+ }
return query;
}
@@ -73,6 +83,7 @@
public static class DaoQuery {
public String appCode;
public String name;
+ private Integer state;
public Date minCreateTime;
public Date maxCreateTime;
public int start;
--
Gitblit v1.8.0