From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/DynamicInfoDao.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/DynamicInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/DynamicInfoDao.java
index 10d198f..afd1283 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/DynamicInfoDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/DynamicInfoDao.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Repository;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
+import com.yeshi.fanli.log.LogHelper;
@Repository
public class DynamicInfoDao {
@@ -63,9 +64,16 @@
Query query = new Query();
query.addCriteria(Criteria.where("id").is(record.getId()));
- // 鏇存柊鍒嗕韩娆℃暟
- Update update = Update.update("imgs", record.getImgs()).set("desc", record.getDesc());
- mongoTemplate.updateMulti(query, update, DynamicInfo.class);
+ if (record.getClassId() == 1) {
+ Update update = Update.update("imgs", record.getImgs()).set("desc", record.getDesc());
+ mongoTemplate.updateMulti(query, update, DynamicInfo.class);
+ } else {
+ Update update = Update.update("imgs", record.getImgs());
+ mongoTemplate.updateMulti(query, update, DynamicInfo.class);
+ }
+
+
+
}
/**
@@ -115,17 +123,25 @@
* @return
*/
public void removeByDate(Date createTime) {
- Query query = new Query();
- query.addCriteria(Criteria.where("createTime").lt(createTime));
- query.addCriteria(
- new Criteria().andOperator(
- Criteria.where("createTime").lt(createTime),
- Criteria.where("classId").ne(4L)
- )
- );
- mongoTemplate.remove(query);
+ LogHelper.test("removeByDate--寮�濮嬫墽琛屽姩鎬佸垹闄�---");
+ for(int i = 0; i < 20; i++) {
+ Query query = new Query();
+ query.addCriteria(Criteria.where("createTime").lt(createTime));
+ query.skip(0).limit(100);
+ LogHelper.test("removeByDate--鏌ヨ---");
+ List<DynamicInfo> list = mongoTemplate.find(query, DynamicInfo.class);
+ if (list == null || list.size() == 0) {
+ break;
+ }
+
+ LogHelper.test("removeByDate--for鍒犻櫎---" + list.size());
+ for (DynamicInfo info: list) {
+ mongoTemplate.remove(info);
+ }
+ }
+
+ LogHelper.test("removeByDate--缁撴潫鍔ㄦ�佸垹闄�---");
}
-
/**
--
Gitblit v1.8.0