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/GroupServiceImpl.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java b/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java
index e15f389..c3e0085 100644
--- a/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java
@@ -14,8 +14,10 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import javax.el.ELClass;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -58,21 +60,39 @@
List<GroupMessageVo> list = messageDao.selectList(new QueryWrapper<Message>().eq("group_id", id).orderByAsc("ctime")).stream().map(item -> {
String username;
String pic = null;
+ Integer flag = 0;
if (item.getUserId() == null) {
- username = userDao.selectOne(new QueryWrapper<User>().eq("id", item.getCopId())).getRealName();
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", item.getCopId()));
+ flag = 2;
+ username = user.getRealName();
} else {
Report report = reportDao.selectOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
- username = userDao.selectOne(new QueryWrapper<User>().eq("id", report.getUserId())).getRealName();
+
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", report.getUserId()));
+ String sex = user.getSex();
+ if (sex == null || sex != "鐢�"){
+ flag = 0;
+ }
+ else {
+ flag = 1;
+ }
+ if (!Objects.isNull(user)){
+ username = user.getRealName();
+ }else {
+ username="";
+ }
pic = report.getPic();
Message message = new Message();
message.setReportName(username);
- messageDao.update(message,new QueryWrapper<Message>().eq("user_id",item.getUserId()));
+ messageDao.update(message, new QueryWrapper<Message>().eq("user_id", item.getUserId()));
}
GroupMessageVo groupMessageVo = new GroupMessageVo();
groupMessageVo.setUserName(username);
groupMessageVo.setText(item.getText());
groupMessageVo.setCtime(item.getCtime());
groupMessageVo.setPic(pic);
+ groupMessageVo.setMessageId(item.getId());
+ groupMessageVo.setFlag(flag);
return groupMessageVo;
}).collect(Collectors.toList());
return list;
@@ -80,7 +100,7 @@
@Override
public List<Announcement> getAllNotice(Integer id) {
- return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id).eq(Announcement::getStatus,1));
+ return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id).eq(Announcement::getStatus, 1));
}
@Override
@@ -96,37 +116,17 @@
}
@Override
- public List<GroupMessageVo> getByCondition(String name, String text,Integer groupId) {
- List<GroupMessageVo> groupUserVoList;
- if (StringUtils.isBlank(name)) {
- groupUserVoList = messageDao.selectList(new QueryWrapper<Message>().like(StringUtils.isNotBlank(text), "text", text).eq("group_id",groupId).orderByAsc("ctime")).stream().map(item -> {
- String username;
- String pic = null;
- if (item.getUserId() == null) {
- username = userDao.selectOne(new QueryWrapper<User>().eq("cop_id", item.getCopId())).getRealName();
- } else {
+ public List<GroupMessageVo> getByCondition(String name, String text, Integer groupId) {
+ return messageDao.selectList(new QueryWrapper<Message>().like(StringUtils.isNotBlank(text), "text", text).eq(StringUtils.isNotBlank(name),"report_name",name).eq("group_id", groupId).orderByAsc("ctime")).stream()
+ .filter(item -> item.getUserId() != null)
+ .map(item -> {
Report report = reportDao.selectOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
- username = userDao.selectOne(new QueryWrapper<User>().eq("id", report.getUserId())).getRealName();
- pic = report.getPic();
- }
- GroupMessageVo groupMessageVo = new GroupMessageVo();
- groupMessageVo.setUserName(username);
- groupMessageVo.setText(item.getText());
- groupMessageVo.setCtime(item.getCtime());
- groupMessageVo.setPic(pic);
- return groupMessageVo;
- }).collect(Collectors.toList());
- } else {
- groupUserVoList = messageDao.selectList(new QueryWrapper<Message>().eq("report_Name", name).eq("group_id",groupId).orderByAsc("ctime")).stream().map(item -> {
- Report report = reportDao.selectOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
- GroupMessageVo groupMessageVo = new GroupMessageVo();
- groupMessageVo.setUserName(item.getReportName());
- groupMessageVo.setText(item.getText());
- groupMessageVo.setCtime(item.getCtime());
- groupMessageVo.setPic(report.getPic());
- return groupMessageVo;
- }).collect(Collectors.toList());
- }
- return groupUserVoList;
+ GroupMessageVo groupMessageVo = new GroupMessageVo();
+ groupMessageVo.setUserName(item.getReportName());
+ groupMessageVo.setText(item.getText());
+ groupMessageVo.setCtime(item.getCtime());
+ groupMessageVo.setPic(report.getPic());
+ return groupMessageVo;
+ }).collect(Collectors.toList());
}
}
--
Gitblit v1.8.0