feat(approve): 添加企业新闻审批功能并完善审批实例管理

liyong

7 天以前 ed0d872dddf37672ceb9bc499099f65d63ed1ce3

 src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java

@@ -1,24 +1,31 @@
package com.ruoyi.project.system.service.impl;



import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.stream.Collectors;

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.github.xiaoymin.knife4j.core.util.StrUtil;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.project.system.mapper.SysUserMapper;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import com.ruoyi.project.system.domain.SysNotice;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.collaborativeApproval.mapper.EnterpriseNewsMapper;
import com.ruoyi.collaborativeApproval.pojo.EnterpriseNews;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.domain.SysUserDept;

import com.ruoyi.project.system.mapper.SysDeptMapper;

import com.ruoyi.project.system.mapper.SysNoticeMapper;

import com.ruoyi.project.system.mapper.SysUserDeptMapper;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.service.ISysNoticeService;

import lombok.RequiredArgsConstructor;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.regex.Matcher;
import java.util.regex.Pattern;


/**

 * 公告 服务层实现

@@ -26,17 +33,17 @@
 * @author ruoyi

 */

@Service

public class SysNoticeServiceImpl  extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {



    @Autowired

    private SysNoticeMapper noticeMapper;



    @Autowired

    private SysUserMapper userMapper;



    @Autowired

    @Lazy

    private ISysNoticeService sysNoticeService;

@RequiredArgsConstructor

public class SysNoticeServiceImpl  extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {

    private static final Pattern ENTERPRISE_NEWS_ID_PATTERN = Pattern.compile("[?&]id=(\\d+)");

    private final SysNoticeMapper noticeMapper;
    private final SysUserMapper userMapper;
    private final SysDeptMapper deptMapper;
    private final SysUserDeptMapper userDeptMapper;
    private final UnipushService unipushService;
    private final EnterpriseNewsMapper enterpriseNewsMapper;


    /**

     * 查询公告信息

@@ -79,11 +86,26 @@
     * @param notice 公告信息

     * @return 结果

     */

    @Override

    public int updateNotice(SysNotice notice)

    {

        return noticeMapper.updateNotice(notice);

    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int updateNotice(SysNotice notice)
    {
        if (notice == null || notice.getNoticeId() == null) {
            return 0;
        }
        SysNotice dbNotice = noticeMapper.selectNoticeById(notice.getNoticeId());
        if (dbNotice == null) {
            return 0;
        }
        boolean needSyncNewsReadCount = isEnterpriseNewsNotice(dbNotice)
                && notice.getStatus() != null
                && !notice.getStatus().equals(dbNotice.getStatus());
        int rows = noticeMapper.updateNotice(notice);
        if (rows > 0 && needSyncNewsReadCount) {
            syncEnterpriseNewsReadCount(dbNotice.getJumpPath());
        }
        return rows;
    }


    /**

     * 删除公告对象

@@ -117,69 +139,94 @@
    }



    @Override

    public int readAll() {

        Long userId = SecurityUtils.getUserId();

        return noticeMapper.update(null, Wrappers.<SysNotice>lambdaUpdate()

                .eq(SysNotice::getConsigneeId, userId)

                .eq(SysNotice::getStatus, "0")

                .set(SysNotice::getStatus, "1"));

    }

    public int readAll() {
        Long userId = SecurityUtils.getUserId();
        List<SysNotice> unreadNotices = noticeMapper.selectList(Wrappers.<SysNotice>lambdaQuery()
                .eq(SysNotice::getConsigneeId, userId)
                .eq(SysNotice::getStatus, "0"));
        int rows = noticeMapper.update(null, Wrappers.<SysNotice>lambdaUpdate()
                .eq(SysNotice::getConsigneeId, userId)
                .eq(SysNotice::getStatus, "0")
                .set(SysNotice::getStatus, "1"));
        if (rows > 0) {
            syncEnterpriseNewsReadCount(unreadNotices);
        }
        return rows;
    }


    @Override

    public void simpleNoticeByRoles(final String title, String message, List<String> needPushRoles,

                                             final String jumpPath) {

        Long userId = SecurityUtils.getUserId();

        if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPushRoles)) {

            return;

        }

        List<String> rolesWithAdmin = new ArrayList<>(needPushRoles);

        rolesWithAdmin.add("管理员");

        List<SysNotice> collect = rolesWithAdmin.stream()

                .flatMap(it -> userMapper.getUserByRole(it).stream())

                .map(it -> convertSysNotice(title, message, it, jumpPath, userId))

    public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        Long tenantId = SecurityUtils.getLoginUser().getTenantId();

        List<SysNotice> sysNotices = consigneeId.stream()

                .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, unipushService.convertWebPathToAppPath(jumpPath), userId))

                .collect(Collectors.toList());

        sysNoticeService.insertBatch(collect);

        noticeMapper.insert(sysNotices);

        try {

            unipushService.sendClientMessage(sysNotices);

        } catch (Exception e) {

            log.error("APP推送通知失败，原因: {}", e);

        }

    }



    @Override

    public void simpleNoticeByPerms(String title, String message, List<String> needPerms,

                                             String jumpPath) {

    public void simpleNoticeAll(String title, String message,  String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPerms)) {

        if (userId == null) {

            return;

        }

        List<SysNotice> collect = userMapper.getUserByPerms(needPerms).stream().map(it -> convertSysNotice(title, message, it, jumpPath,  userId)).collect(Collectors.toList());

        sysNoticeService.insertBatch(collect);

    }

        Long rootDeptId = SecurityUtils.getLoginUser().getTenantId();

        //  查所有子部门

        List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);



    @Override

    public void simpleNoticeByUser(String title, String message, Long consigneeId,

                                    String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        SysNotice sysNotice = convertSysNotice(title, message, consigneeId, jumpPath, userId);

        sysNoticeService.save(sysNotice);

    }

        //  组装 deptIds

        List<Long> deptIds = childrenDepts.stream()

                .map(SysDept::getDeptId)

                .collect(Collectors.toList());

        deptIds.add(rootDeptId);



    @Override

    public void simpleNoticeAll(String title, String message, String jumpPath) {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(), jumpPath,  userId)).collect(Collectors.toList());

        sysNoticeService.saveBatch(collect);

    }

        //  查用户ID

        List<Long> userIds = userDeptMapper.selectList(

                        Wrappers.<SysUserDept>lambdaQuery()

                                .in(SysUserDept::getDeptId, deptIds)

                ).stream()

                .map(SysUserDept::getUserId)

                .distinct()

                .collect(Collectors.toList());



    @Override

    public void insertBatch(List<SysNotice> noticesList) {

        if(CollectionUtils.isEmpty(noticesList)){

        if (userIds.isEmpty()) {

            return;

        }

        // 排除掉自己

        Long userId = SecurityUtils.getUserId();

        List<SysNotice> noticesListNew = noticesList.stream().filter(Objects::nonNull).filter(it -> !Objects.equals(it.getConsigneeId(), userId)).collect(Collectors.toList());

        sysNoticeService.saveBatch(noticesListNew);



        //  查用户

        List<SysUser> sysUsers = userMapper.selectList(

                Wrappers.<SysUser>lambdaQuery()

                        .eq(SysUser::getStatus, "0")

                        .in(SysUser::getUserId, userIds)

        );



        //  发通知

        List<SysNotice> collect = sysUsers.stream()

                .map(it -> convertSysNotice(

                        title,

                        message,

                        it.getUserId(),

                        it.getTenantId(),

                        jumpPath,

                        unipushService.convertWebPathToAppPath(jumpPath),

                        userId

                ))

                .collect(Collectors.toList());

        noticeMapper.insert(collect);

        try {

            unipushService.sendClientMessage(collect);

        } catch (Exception e) {

            log.error("APP推送通知失败，原因: {}", e);

        }

    }



    private SysNotice convertSysNotice(String title,String message,Long consigneeId,String jumpPath,Long currentUserId) {



    private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,String appJumpPath,Long currentUserId) {

        SysNotice sysNotice = new SysNotice();

        sysNotice.setNoticeType("1");

        sysNotice.setNoticeTitle(title);//标题

@@ -188,6 +235,79 @@
        sysNotice.setConsigneeId(consigneeId);

        sysNotice.setSenderId(currentUserId);

        sysNotice.setJumpPath(jumpPath);

        sysNotice.setAppJumpPath(appJumpPath);

        sysNotice.setTenantId(tenantId);

        return sysNotice;

    }

}



    @Override

    @Transactional(rollbackFor = Exception.class)

    public boolean appReadNotice(Long noticeId) {
        if (noticeId == null) {
            return false;
        }

        SysNotice sysNotice = noticeMapper.selectNoticeById(noticeId);

        if (sysNotice == null) {

            return false;

        }
        sysNotice.setStatus("1");
        boolean updated = noticeMapper.update(null, Wrappers.<SysNotice>lambdaUpdate()
                .eq(SysNotice::getNoticeId, noticeId)
                .eq(SysNotice::getStatus, "0")
                .set(SysNotice::getStatus, "1")) > 0;
        if (updated) {
            syncEnterpriseNewsReadCount(sysNotice.getJumpPath());
        }
        return updated;
    }

    private boolean isEnterpriseNewsNotice(SysNotice sysNotice) {
        return sysNotice != null
                && sysNotice.getJumpPath() != null
                && sysNotice.getJumpPath().startsWith("/enterpriseNews?id=");
    }

    private void syncEnterpriseNewsReadCount(List<SysNotice> notices) {
        if (notices == null || notices.isEmpty()) {
            return;
        }
        Set<String> jumpPaths = new HashSet<>();
        for (SysNotice notice : notices) {
            if (isEnterpriseNewsNotice(notice)) {
                jumpPaths.add(notice.getJumpPath());
            }
        }
        for (String jumpPath : jumpPaths) {
            syncEnterpriseNewsReadCount(jumpPath);
        }
    }

    private void syncEnterpriseNewsReadCount(String jumpPath) {
        Long newsId = parseEnterpriseNewsId(jumpPath);
        if (newsId == null) {
            return;
        }
        long readCount = noticeMapper.selectCount(Wrappers.<SysNotice>lambdaQuery()
                .eq(SysNotice::getStatus, "1")
                .eq(SysNotice::getJumpPath, jumpPath));
        EnterpriseNews enterpriseNews = new EnterpriseNews();
        enterpriseNews.setId(newsId);
        enterpriseNews.setReadCount((int) readCount);
        enterpriseNewsMapper.updateById(enterpriseNews);
    }

    private Long parseEnterpriseNewsId(String jumpPath) {
        if (jumpPath == null || !jumpPath.startsWith("/enterpriseNews")) {
            return null;
        }
        Matcher matcher = ENTERPRISE_NEWS_ID_PATTERN.matcher(jumpPath);
        if (!matcher.find()) {
            return null;
        }
        try {
            return Long.parseLong(matcher.group(1));
        } catch (NumberFormatException e) {
            return null;
        }
    }
}