fix:sql;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java

@@ -14,7 +14,7 @@ import com.liquidnet.service.adam.entity.AdamCollection;
  * @author liquidnet
  * @since 2021-05-10
  */
-public interface IAdamCollectionService extends IService<AdamCollection> {
+public interface IAdamCollectionService {
 
     void add(AdamCollectBaseVo collectVo);
 

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

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
 import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
 import com.liquidnet.service.adam.service.IAdamCollectionService;
@@ -16,9 +16,9 @@ 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.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +32,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -44,9 +45,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
-    @Autowired
-    MongoConverter mongoConverter;
+public class AdamCollectionServiceImpl implements IAdamCollectionService {
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -83,13 +82,25 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
 
     @Override
     public void del(String uid, String type, String... contentIds) {
+        LocalDateTime now = LocalDateTime.now();
+        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
+
         AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
         delVo.setState(2);
-        delVo.setUpdatedAt(DateUtil.getNowTime());
+        delVo.setUpdatedAt(nowStr);
+
         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 BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
+                new Document("$set", Document.parse(JsonUtils.toJson(delVo))));
+        if (updateResult.getModifiedCount() > 0) {
+            LinkedList<Object[]> toMqObjs = new LinkedList<>();
+            for (String c : contentIds) {
+                toMqObjs.add(new Object[]{now, uid, c});
+            }
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                    SqlMapping.get("adam_collection.del", toMqObjs));
+        }
     }
 
     @Override

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

@@ -3,28 +3,33 @@ package com.liquidnet.service.adam.service.impl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.adam.dto.vo.*;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
 import com.liquidnet.service.adam.service.IAdamDisposedService;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 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.BasicDBObject;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -38,8 +43,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class AdamDisposedServiceImpl implements IAdamDisposedService {
-    @Autowired
-    MongoConverter mongoConverter;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -77,13 +80,24 @@ 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(DateUtil.getNowTime());
-        mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateMany(
+        delVo.setUpdatedAt(nowStr);
+        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 BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
+                new Document("$set", Document.parse(JsonUtils.toJson(delVo))));
+        if (updateResult.getModifiedCount() > 0) {
+            LinkedList<Object[]> toMqObjs = new LinkedList<>();
+            for (String c : contentIds) {
+                toMqObjs.add(new Object[]{now, uid, c});
+            }
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                    SqlMapping.get("adam_disposed.del", toMqObjs));
+        }
     }
 
     @Override

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

@@ -174,11 +174,17 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         thirdPartInfoVo.setState(1);// 1-绑定
 
         mongoTemplate.insert(thirdPartInfoVo, AdamThirdPartInfoVo.class.getSimpleName());
-        // TODO: 2021/5/14 Execute sql to mq
 
         adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
 
         adamRdmService.delThirdPartVoListByUid(uid);
+
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(
+                        "adam_third_party.add",
+                        thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
+                )
+        );
     }
 
     @Override
@@ -196,11 +202,17 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         thirdPartInfoVo.setState(1);// 1-绑定
 
         mongoTemplate.insert(thirdPartInfoVo, AdamThirdPartInfoVo.class.getSimpleName());
-        // TODO: 2021/5/14 Execute sql to mq
 
         adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), bindUid);
 
         adamRdmService.delThirdPartVoListByUid(bindUid);
+
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(
+                        "adam_third_party.add",
+                        thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
+                )
+        );
     }
 
     /**
@@ -228,16 +240,14 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         }
         adamRdmService.delThirdPartVoListByUid(uid);
 
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get("adam_third_party.unbind", now, uid, platform));
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get("adam_third_party.unbind", now, uid, platform));
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void unBindTpa(String uid, String platform) {
         this.unBindTpaProcess(uid, platform);
-
-        // TODO: 2021/5/14 Execute sql to mq
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -30,9 +30,11 @@ adam_enters.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=?,
 
 # ----------------------------------------------------
 adam_collection.add=INSERT INTO adam_collection (`uid`, content_id, `type`, `state`, created_at) VALUES (?,?,?,?,?) 
+adam_collection.del=UPDATE adam_collection SET `state`=2, updated_at=? WHERE `uid`=? AND content_id=? 
 
 # ----------------------------------------------------
-adam_disposed.add=INSERT into adam_disposed (`uid`, content_id, `type`, `state`, created_at) VALUES ()
+adam_disposed.add=INSERT into adam_disposed (`uid`, content_id, `type`, `state`, created_at) VALUES (?,?,?,?,?)
+adam_disposed.del=UPDATE adam_collection SET `state`=2, updated_at=? WHERE `uid`=? AND content_id=? 
 
 # ----------------------------------------------------
 adam_member.add=INSERT INTO adam_member ( `name`, `title`, `sub_title`, `icon`, `avatar`, `start_no`, `type`, `interests_detail`, `notes`, `is_notice`, `notice_info`, `notice_title`, `need_question`, `display_agreement`, `agreement`, `member_id`, `limitation`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);