opt;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
@@ -78,15 +79,11 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
     public void del(String uid, String type, String... contentIds) {
         LocalDateTime now = LocalDateTime.now();
 
-//        AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
-//        delVo.setState(2);
-//        delVo.setUpdatedAt(now);
-
-        UpdateResult updateResult = mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                        .and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("updatedAt", now)));
-        if (updateResult.getModifiedCount() > 0) {
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").in(contentIds)),
+                AdamCollectBaseVo.class.getSimpleName()
+        );
+        if (deleteResult.getDeletedCount() > 0) {
             LinkedList<Object[]> toMqObjs = new LinkedList<>();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
@@ -98,9 +95,10 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
 
     @Override
     public boolean queryState(String uid, String type, String contentId) {
-        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                .and("contentId").is(contentId).and("state").is(1)), AdamCollectBaseVo.class.getSimpleName());
-        return count > 0;
+        return mongoTemplate.exists(
+                Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
+                AdamCollectBaseVo.class.getSimpleName()
+        );
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

@@ -13,6 +13,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
@@ -80,17 +81,12 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
     @Override
     public void del(String uid, String type, String... contentIds) {
         LocalDateTime now = LocalDateTime.now();
-        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
 
-//        AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
-//        delVo.setState(2);
-//        delVo.setUpdatedAt(now);
-
-        UpdateResult updateResult = mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                        .and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("updatedAt", now)));
-        if (updateResult.getModifiedCount() > 0) {
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").in(contentIds)),
+                AdamDisposedBaseVo.class.getSimpleName()
+        );
+        if (deleteResult.getDeletedCount() > 0) {
             LinkedList<Object[]> toMqObjs = new LinkedList<>();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
@@ -102,9 +98,10 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
 
     @Override
     public boolean queryState(String uid, String type, String contentId) {
-        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                .and("contentId").is(contentId).and("state").is(1)), AdamDisposedBaseVo.class.getSimpleName());
-        return count > 0;
+        return mongoTemplate.exists(
+                Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
+                AdamDisposedBaseVo.class.getSimpleName()
+        );
     }
 
     @Override