添加推送redis更改处理方式增加推送时间排序

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

@@ -13,7 +13,6 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.ios.IOSBroadcast;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 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;
@@ -29,6 +28,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -85,7 +85,32 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             adminUpushMapper.insert(adminUpush);
 
             // 处理缓存数据
-            AdminUpushVo adminUpushVo = new AdminUpushVo();
+            List<AdminUpush> pushListIos = adminUpushMapper.selectList(
+                    Wrappers.lambdaQuery(AdminUpush.class)
+                            .in(AdminUpush::getPushRange, 1, 2)
+                            .orderByDesc(AdminUpush::getPushTime)
+                            .last("LIMIT 20")
+            );
+            LinkedList<AdminUpush> pushLinkedIos = pushListIos.stream().collect(Collectors.toCollection(LinkedList::new));
+            List<AdminUpush> pushListAndroid = adminUpushMapper.selectList(
+                    Wrappers.lambdaQuery(AdminUpush.class)
+                            .in(AdminUpush::getPushRange, 1, 3)
+                            .orderByDesc(AdminUpush::getPushTime)
+                            .last("LIMIT 20")
+            );
+            LinkedList<AdminUpush> pushLinkedAndroid = pushListAndroid.stream().collect(Collectors.toCollection(LinkedList::new));
+
+            String redisKeyIos = KylinRedisConst.ADMIN_UPUSH_LIST_IOS;
+            String redisKeyAndroid = KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID;
+            if (upushParam.getPushRange() == 1) { // all
+                redisDataSourceUtil.getRedisKylinUtil().set(redisKeyIos, pushLinkedIos);
+                redisDataSourceUtil.getRedisKylinUtil().set(redisKeyAndroid, pushLinkedAndroid);
+            } else if (upushParam.getPushRange() == 2) { // ios
+                redisDataSourceUtil.getRedisKylinUtil().set(redisKeyIos, pushLinkedIos);
+            } else if (upushParam.getPushRange() == 3) { // android
+                redisDataSourceUtil.getRedisKylinUtil().set(redisKeyAndroid, pushLinkedAndroid);
+            }
+            /*AdminUpushVo adminUpushVo = new AdminUpushVo();
             BeanUtils.copyProperties(adminUpush, adminUpushVo);
             adminUpushVo.setMessageType(2);
             adminUpushVo.setSpecifyType(2); // 这里暂时写死就行 如果以后改需求再处理
@@ -136,7 +161,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
                 redisDataSourceUtil.getRedisKylinUtil().set(redisKeyIos, pushList);
             } else if(upushParam.getPushRange() == 3) { // android
                 redisDataSourceUtil.getRedisKylinUtil().set(redisKeyAndroid, pushList);
-            }
+            }*/
 
             // 推送
             if (adminUpush.getIsPush() == 1) {