青羊经侦大队-数据平台
baizonghao
2023-05-22 aa8836a65e97e297340fff3a42615f0a36f314e7
后台管理端删除聊天记录,新增新增头像,用户管理删选条件等
6个文件已修改
43 ■■■■ 已修改文件
src/main/java/com/example/jz/controller/GroupController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/example/jz/controller/MessageController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/example/jz/controller/UserController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/example/jz/controller/WxAppController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/example/jz/modle/vo/GroupMessageVo.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/example/jz/service/impl/GroupServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 = "获取当前群组消息通过成员或者内容")
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("删除成功");
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) {
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);
    }
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;
}
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;