From bd885c7015446c6c0495d3299ef64068a4c9b30e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 15:00:34 +0800
Subject: [PATCH] CMQ改造为rabbitmq
---
service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java b/service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java
index 01f8dd6..32693f7 100644
--- a/service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java
+++ b/service-push/src/main/java/com/ks/push/dao/BPushDeviceTokenDao.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Repository;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -19,7 +20,7 @@
public void updateSelective(BPushDeviceToken bean) {
Query query = new Query();
Update update = new Update();
- query.addCriteria(Criteria.where("id").is(bean.getId()));
+ query.addCriteria(Criteria.where("_id").is(bean.getId()));
if (bean.getAppCode() != null) {
update.set("appCode", bean.getAppCode());
}
@@ -111,6 +112,10 @@
andList.add(Criteria.where("updateTime").lt(daoQuery.maxUpdateTime));
}
+ if (daoQuery.token != null) {
+ andList.add(Criteria.where("token").lt(daoQuery.token));
+ }
+
Criteria[] ands = new Criteria[andList.size()];
andList.toArray(ands);
@@ -124,7 +129,9 @@
Query query = getQuery(daoQuery);
query.skip(start);
query.limit(count);
- query.with(Sort.by(new Sort.Order(Sort.Direction.ASC, "updateTime")));
+ List<Sort.Order> orderList = new ArrayList<>();
+ orderList.add(new Sort.Order(Sort.Direction.ASC, "updateTime"));
+ query.with(Sort.by(orderList));
return findList(query);
}
@@ -141,10 +148,10 @@
public List<String> uidList;
public List<String> deviceIdList;
public List<String> brandNameList;
+ public String token;
public Date minUpdateTime;
public Date maxUpdateTime;
public Date minCreateTime;
public Date maxCreateTime;
-
}
}
--
Gitblit v1.8.0