From 9026ba0732e59779c028d3a3c2a067c563201301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sat, 5 Sep 2020 15:43:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/service/serviceimpl/VisitorServiceImpl.java | 2 +- .../blog/service/serviceimpl/WebUpdateInfoServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java index 046805c..ee5e1a4 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java @@ -51,7 +51,7 @@ public class VisitorServiceImpl implements VisitorService { public PageData visitorPage(int page, int count, boolean showLocation) { PageHelper.startPage(page, count); List visitorList = visitorMapper.findAll(); - return new PageData(new PageInfo(visitorList), list2List(visitorList, showLocation)); + return new PageData<>(new PageInfo<>(visitorList), list2List(visitorList, showLocation)); } @Override diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java index ce51248..44240e6 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import java.io.IOException; import java.time.Instant; import java.util.*; +import java.util.stream.Collectors; /** * @author : xiaohai @@ -72,7 +73,7 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { public PageData pages(int count, int page) { PageHelper.startPage(page, count); List updateList = webUpdateInfoMapper.findAll(); - return new PageData(new PageInfo(updateList), list2List(updateList)); + return new PageData<>(new PageInfo<>(updateList), list2List(updateList)); } @Override @@ -108,8 +109,6 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { } private List list2List(List webUpdates) { - List webUpdateModels = new ArrayList<>(); - webUpdates.forEach(update -> webUpdateModels.add(ModalTrans.webUpdate(update))); - return webUpdateModels; + return webUpdates.stream().map(ModalTrans::webUpdate).collect(Collectors.toList()); } }