更新minlo

wl

2022-10-19 744cd0a3bc66de73a94e320724b1bb776a6e4080

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

@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.jz.dao.*;
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.ReportVo;
import com.example.jz.modle.vo.MessageVo;
import com.example.jz.modle.vo.ReportVo;
import com.example.jz.service.WorkbenchService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -66,31 +66,39 @@

    @Override
    public List<ReportVo> getAllCheckPendingList() {
        //查询待审核人
        List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("status", 0).orderByDesc("ctime").last("limit 5"));
        ArrayList<ReportVo> reportVos = new ArrayList<>();
        reports.forEach(a -> {
            User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
            ReportVo reportVo = new ReportVo();
            reportVo.setReporterName(user.getRealName());
            String regex = "(?<=[\\d]{3})\\d(?=[\\d]{4})";
            reportVo.setIdcard(user.getUserIdcard().replaceAll(regex, "*"));
            reportVo.setMobile(user.getUserMobile());
            reportVos.add(reportVo);
        });
        if(!reports.isEmpty()){
            reports.forEach(a -> {
                User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
                ReportVo reportVo = new ReportVo();
                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());
                reportVos.add(reportVo);
            });
        }
        return reportVos;
    }

    @Override
    public List<MessageVo> getGroupMessage() {
        ArrayList<MessageVo> messageVos = new ArrayList<>();
        messageDao.selectList(new QueryWrapper<Message>().orderByDesc("ctime").last("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(userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId())).getRealName());
                    messageVos.add(messageVo);
                });
        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;
    }
}