From 7ea5eece501c98a91555a5358931367e78e9d23b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 25 五月 2023 15:40:09 +0800
Subject: [PATCH] 11
---
src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
index b4542c9..d82a615 100644
--- a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class WorkbenchServiceImpl implements WorkbenchService {
@@ -69,17 +70,17 @@
//鏌ヨ寰呭鏍镐汉
List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("status", 0).orderByDesc("ctime").last("limit 5"));
ArrayList<ReportVo> reportVos = new ArrayList<>();
- if(!reports.isEmpty()){
+ if (!reports.isEmpty()) {
reports.forEach(a -> {
User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
ReportVo reportVo = new ReportVo();
- if (user!=null){
+ if (user != null) {
reportVo.setReporterName(user.getRealName());
String regex = "(?<=[\\d]{3})\\d(?=[\\d]{4})";
reportVo.setIdcard(user.getUserIdcard().replaceAll(regex, "*"));
reportVo.setMobile(user.getUserMobile());
}
- reportVo.setId(a.getId());
+// reportVo.setId(a.getId());
reportVos.add(reportVo);
});
}
@@ -88,17 +89,13 @@
@Override
public List<MessageVo> getGroupMessage() {
- ArrayList<MessageVo> messageVos = new ArrayList<>();
- if (!messageVos.isEmpty()){
- messageDao.selectList(new QueryWrapper<Message>().orderByDesc("ctime")).stream()
- .filter(item->item.getUserId()!=null).limit(5).forEach(a -> {
- MessageVo messageVo = new MessageVo();
- messageVo.setGroupName(groupDao.selectOne(new QueryWrapper<Group>().eq("id", a.getGroupId())).getGroupName());
- BeanUtils.copyProperties(a, messageVo);
- messageVo.setUserName(a.getReportName());
- messageVos.add(messageVo);
- });
- }
- return messageVos;
+ return messageDao.selectList(new QueryWrapper<Message>().orderByDesc("ctime")).stream()
+ .filter(item -> item.getUserId() != null).limit(5).map(a -> {
+ MessageVo messageVo = new MessageVo();
+ messageVo.setGroupName(groupDao.selectOne(new QueryWrapper<Group>().eq("id", a.getGroupId())).getGroupName());
+ BeanUtils.copyProperties(a, messageVo);
+ messageVo.setUserName(a.getReportName());
+ return messageVo;
+ }).collect(Collectors.toList());
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0