AdminUpushVo

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/AdminUpushVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * upush 系统消息
@@ -14,7 +16,9 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class AdminUpushVo {
+public class AdminUpushVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 8635450456535735379L;
 
     @ApiModelProperty(value = "upush_id")
     private String upushId;
@@ -79,4 +83,14 @@ public class AdminUpushVo {
     private String createdAt;
 
     private String updatedAt;
+
+    private static final AdminUpushVo obj = new AdminUpushVo();
+
+    public static AdminUpushVo getNew() {
+        try {
+            return (AdminUpushVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdminUpushVo();
+        }
+    }
 }

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.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;
@@ -91,14 +92,24 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
                             .orderByDesc(AdminUpush::getPushTime)
                             .last("LIMIT 20")
             );
-            LinkedList<AdminUpush> pushLinkedIos = pushListIos.stream().collect(Collectors.toCollection(LinkedList::new));
+            LinkedList<AdminUpushVo> pushLinkedIos = new LinkedList<>();
+            for (AdminUpush upush : pushListIos) {
+                AdminUpushVo adminUpushVo = AdminUpushVo.getNew();
+                BeanUtils.copyProperties(upush, adminUpushVo);
+                pushLinkedIos.add(adminUpushVo);
+            }
             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));
+            LinkedList<AdminUpushVo> pushLinkedAndroid = new LinkedList<>();
+            for (AdminUpush upush : pushListAndroid) {
+                AdminUpushVo adminUpushVo = AdminUpushVo.getNew();
+                BeanUtils.copyProperties(upush, adminUpushVo);
+                pushLinkedAndroid.add(adminUpushVo);
+            }
 
             String redisKeyIos = KylinRedisConst.ADMIN_UPUSH_LIST_IOS;
             String redisKeyAndroid = KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID;