src/main/java/com/example/jz/controller/WxAppController.java

@@ -3,6 +3,7 @@

import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -12,6 +13,7 @@
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.CauseVo;
import com.example.jz.modle.vo.MemberVo;
import com.example.jz.modle.vo.ReportVo;
import com.example.jz.service.*;
import com.example.jz.utils.HttpUtil;
import lombok.SneakyThrows;
@@ -38,7 +40,7 @@
    private final String wxApp_accessToken_verify_url = "https://api.weixin.qq.com/cgi-bin/token";

    @Value("${wx.appid}")
    private  String appid;
    private String appid;

    @Value("${wx.secret}")
    private String secret;
@@ -66,6 +68,8 @@
    MessageService messageService;
    @Autowired
    GroupUserService groupUserService;
    @Autowired
    PublicityService publicityService;

    @GetMapping("/login")
    @SneakyThrows
@@ -126,7 +130,7 @@
        loginMessage.put("id", id);
        loginMessage.put("token", token);
        loginMessage.put("role", role);
        loginMessage.put("time",user1.getUserIdcard());
        loginMessage.put("time", user1.getUserIdcard());
        return R.ok(loginMessage);
    }

@@ -200,7 +204,7 @@
    @GetMapping("/user/group/list")
    public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
        ArrayList<Map<String, Object>> list = new ArrayList<>();
        reportService.list((new QueryWrapper<Report>().eq("user_id", id)).groupBy("user_id"))
        reportService.list((new QueryWrapper<Report>().eq("user_id", id)))
                .forEach(item ->
                        {
                            GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId()));
@@ -394,7 +398,7 @@

    @GetMapping("/group/user/sendMsg")
    public R sendUserMsg(@RequestParam Integer id, @RequestParam Integer groupId, @RequestParam String msg) {
        if (StringUtils.isBlank(msg)){
        if (StringUtils.isBlank(msg)) {
            return R.failed("msg is blank");
        }
        Message message = new Message();
@@ -405,4 +409,41 @@
        message.setReportName(userService.getOne(new QueryWrapper<User>().eq("id", reportService.getOne(new QueryWrapper<Report>().eq("id", id)).getUserId())).getRealName());
        return R.ok(messageService.save(message));
    }

    @GetMapping("/group/member/detail")
    public R getMemberDetail(@RequestParam Integer id) {
        Report report = reportService.getOne(new LambdaQueryWrapper<Report>().eq(Report::getId, id));
        ReportVo reportVo = new ReportVo();
        BeanUtils.copyProperties(report, reportVo);
        User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, report.getUserId()));
        reportVo.setReporterName(user.getRealName());
        reportVo.setMobile(user.getUserMobile());
        reportVo.setIdcard(user.getUserIdcard());
        return R.ok(reportVo);
    }

    @GetMapping("/manager/report")
    public R queryReport() {
        return R.ok(reportService.list(new LambdaQueryWrapper<Report>().eq(Report::getStatus, 0))
                .stream()
                .map(item -> {
                    ReportVo reportVo = new ReportVo();
                    BeanUtils.copyProperties(item, reportVo);
                    User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, item.getUserId()));
                    reportVo.setReporterName(user.getRealName());
                    reportVo.setMobile(user.getUserMobile());
                    reportVo.setIdcard(user.getUserIdcard());
                    return reportVo;
                })
                .collect(Collectors.toList()));
    }

    @GetMapping("/publicity")
    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);
    }
}

 src/main/java/com/example/jz/modle/vo/ReportVo.java

@@ -1,5 +1,6 @@
package com.example.jz.modle.vo;

import com.example.jz.modle.entity.Report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,7 +13,7 @@
 */
@Data
@ApiModel(description = "待审核人员", value = "CauseVo")
public class ReportVo {
public class ReportVo extends Report {
    //报案人
    @ApiModelProperty(value = "报案人",dataType = "String")
    private String reporterName;
@@ -24,8 +25,8 @@
    @ApiModelProperty(value = "报案人身份证号",dataType = "String")
    //报案人身份证号
    private String idcard;

    //报案人id
    @ApiModelProperty(value = "id",dataType = "Integer")
    private Integer id;
//
//    //报案人id
//    @ApiModelProperty(value = "id",dataType = "Integer")
//    private Integer id;
}

 src/main/java/com/example/jz/service/impl/GroupServiceImpl.java

@@ -80,7 +80,7 @@

    @Override
    public List<Announcement> getAllNotice(Integer id) {
        return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id));
        return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id).eq(Announcement::getStatus,1));
    }

    @Override

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