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()); } }