upush mongo

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -13,6 +13,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.UpushDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.UpushParam;
 import com.liquidnet.service.kylin.dto.param.admin.UpushSearchParam;
@@ -27,10 +28,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -87,13 +85,18 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             adminUpushMapper.insert(adminUpush);
 
             // 处理缓存数据
-            AdminUpush adminUpushInfo = adminUpushMapper.selectOne(Wrappers.lambdaQuery(AdminUpush.class).eq(AdminUpush::getUpushId, upushId));
-            if (null == adminUpushInfo.getPushTime()) {
-                adminUpushInfo.setPushTime("");
-            }
             AdminUpushVo adminUpushVo = new AdminUpushVo();
-            BeanUtils.copyProperties(adminUpushInfo, adminUpushVo);
-            mongoTemplate.insert(adminUpushVo, AdminUpushVo.class.getSimpleName());
+            BeanUtils.copyProperties(adminUpush, adminUpushVo);
+            LinkedList<AdminUpushVo> pushList = (LinkedList<AdminUpushVo>) redisUtil.get(KylinRedisConst.ADMIN_UPUSH_LIST);
+            if (CollectionUtil.isEmpty(pushList)) {
+                pushList = new LinkedList<>();
+            } else {
+                if (pushList.size() >= 20) {
+                    pushList.remove(0);
+                }
+            }
+            pushList.addFirst(adminUpushVo);
+            redisUtil.set(KylinRedisConst.ADMIN_UPUSH_LIST, pushList);
 
             if (adminUpush.getIsPush() == 1) {
                 if (adminUpush.getPushRange() == 1) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.entity.AdminUpush;
 import com.liquidnet.service.kylin.mapper.AdminUpushMapper;
 import com.liquidnet.service.kylin.service.admin.IAdminUpushService;
@@ -19,6 +20,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -42,7 +44,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
     RedisUtil redisUtil;
 
     public PageInfo<AdminUpushVo> lists(Integer page, Integer size) {
-        Query query = Query.query(
+        /*Query query = Query.query(
                 Criteria.where("specifyType").is(2).and("messageType").is(2)
                 .and("pushTime").lt(DateUtil.getNowTime())
         );
@@ -75,6 +77,15 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
         } else {
             voPageInfo = new PageInfo<>();
         }
+        return voPageInfo;*/
+        PageInfo<AdminUpushVo> voPageInfo = null;
+        Object adminUpushVo = redisUtil.get(KylinRedisConst.ADMIN_UPUSH_LIST);
+        if (null == adminUpushVo) {
+            voPageInfo = PageInfo.of(null);
+        } else {
+            LinkedList<AdminUpushVo> pushList = (LinkedList<AdminUpushVo>) adminUpushVo;
+            voPageInfo = PageInfo.of(pushList);
+        }
         return voPageInfo;
     }