From aa8836a65e97e297340fff3a42615f0a36f314e7 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期一, 22 五月 2023 16:10:10 +0800
Subject: [PATCH] 后台管理端删除聊天记录，新增新增头像，用户管理删选条件等
---
src/main/java/com/example/jz/controller/MessageController.java | 2 +-
src/main/java/com/example/jz/modle/vo/GroupMessageVo.java | 10 ++++++++++
src/main/java/com/example/jz/controller/UserController.java | 6 +++---
src/main/java/com/example/jz/service/impl/GroupServiceImpl.java | 15 +++++++++++++--
src/main/java/com/example/jz/controller/WxAppController.java | 2 +-
src/main/java/com/example/jz/controller/GroupController.java | 8 ++++++++
6 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/GroupController.java b/src/main/java/com/example/jz/controller/GroupController.java
index 72d06db..e11878e 100644
--- a/src/main/java/com/example/jz/controller/GroupController.java
+++ b/src/main/java/com/example/jz/controller/GroupController.java
@@ -55,6 +55,14 @@
return R.ok(groupService.getAllMessage(id));
}
+// @GetMapping("deleteGroupMessage")
+// @ApiOperation(value = "鍒犻櫎缇ゆ秷鎭�")
+// @ApiImplicitParam(name = "messageId", value = "娑堟伅id", required = true, dataType = "Integer")
+// public R deleteMessage(@RequestParam("messageId") Integer messageId){
+// boolean flag = groupService.removeById(messageId);
+// return flag ? R.ok(true, "鍒犻櫎鎴愬姛") : R.failed("鍒犻櫎鎴愬姛");
+// }
+
@GetMapping("getGroupMessage")
@ApiOperation(value = "鑾峰彇褰撳墠缇ょ粍娑堟伅閫氳繃鎴愬憳鎴栬�呭唴瀹�")
diff --git a/src/main/java/com/example/jz/controller/MessageController.java b/src/main/java/com/example/jz/controller/MessageController.java
index 3c4d5e7..548ee0e 100644
--- a/src/main/java/com/example/jz/controller/MessageController.java
+++ b/src/main/java/com/example/jz/controller/MessageController.java
@@ -34,7 +34,7 @@
@Resource
private MessageService messageService;
- @GetMapping("deleteById")
+ @DeleteMapping("deleteById")
public R deleteById(@RequestParam Integer id){
boolean b = messageService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index c8ad0d0..0e4a015 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -65,13 +65,13 @@
public R selectAll(Page<User> page, User user) {
R<Page<User>> res = R.ok(this.userService.page(page, new QueryWrapper<User>()
.eq("role", 0)
- .and(StringUtils.isNotBlank(user.getNickName()) && StringUtils.isNotBlank(user.getRealName()), new Consumer<QueryWrapper<User>>() {
+ .and(StringUtils.isNotBlank(user.getUserMobile()) && StringUtils.isNotBlank(user.getRealName()), new Consumer<QueryWrapper<User>>() {
@Override
public void accept(QueryWrapper<User> userQueryWrapper) {
- userQueryWrapper.like("real_name", user.getRealName()).or().like("nick_name", user.getNickName());
+ userQueryWrapper.like("real_name", user.getRealName()).or().like("user_mobile", user.getUserMobile());
}
})
- .like(StringUtils.isNotBlank(user.getNickName()) && StringUtils.isBlank(user.getRealName()), "nick_name", user.getNickName())
+ .like(StringUtils.isNotBlank(user.getUserMobile()) && StringUtils.isBlank(user.getRealName()), "user_mobile", user.getUserMobile())
.and(StringUtils.isNotBlank(user.getRealName()) && StringUtils.isBlank(user.getNickName()), new Consumer<QueryWrapper<User>>() {
@Override
public void accept(QueryWrapper<User> userQueryWrapper) {
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 9a86f93..aef4d51 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -653,7 +653,7 @@
public R queryPublicity(@RequestParam(required = false) Integer size) {
List<Publicity> publicityList = publicityService.list(new LambdaQueryWrapper<Publicity>().eq(Publicity::getStatus, 1));
if (size != null) {
- return R.ok(publicityList.stream().limit(size));
+ return R.ok(publicityList.stream().sorted((o1, o2) -> o2.getReleaseTime().compareTo(o1.getReleaseTime())).limit(size));
}
return R.ok(publicityList);
}
diff --git a/src/main/java/com/example/jz/modle/vo/GroupMessageVo.java b/src/main/java/com/example/jz/modle/vo/GroupMessageVo.java
index 2c88ae9..13ba4a6 100644
--- a/src/main/java/com/example/jz/modle/vo/GroupMessageVo.java
+++ b/src/main/java/com/example/jz/modle/vo/GroupMessageVo.java
@@ -6,6 +6,7 @@
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+import javax.validation.constraints.Pattern;
import java.util.Date;
/**
@@ -20,6 +21,10 @@
@EqualsAndHashCode(callSuper = false)
public class GroupMessageVo {
/**
+ * 娑堟伅id
+ */
+ private Integer messageId;
+ /**
* 鐢ㄦ埛鍚�
*/
private String userName;
@@ -33,4 +38,9 @@
* 鍒涘缓鏃堕棿
*/
private Date ctime;
+
+ /**
+ * 0:鐢� 1:濂� 2:璀﹀療
+ */
+ private Integer flag;
}
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 28de451..c3e0085 100644
--- a/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java
@@ -60,13 +60,22 @@
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()));
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 {
@@ -82,6 +91,8 @@
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;
--
Gitblit v1.8.0