refactor: 去除个推和mongo

gongchunyi

3 天以前 5d33059ad9fe7fe70bb43e09ea9199a074cc7c78

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

@@ -1,61 +1,41 @@
package com.ruoyi.project.system.service.impl;



import java.time.LocalDateTime;

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.conditions.Wrapper;

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.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 org.springframework.beans.factory.annotation.Autowired;

import org.springframework.context.annotation.Lazy;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Service;

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

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

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

import lombok.RequiredArgsConstructor;

import lombok.extern.slf4j.Slf4j;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import java.util.List;

import java.util.stream.Collectors;



/**

 * 公告 服务层实现

 *

 * @author ruoyi

 */

@Slf4j

@Service

@RequiredArgsConstructor

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



    @Autowired

    private SysNoticeMapper noticeMapper;



    @Autowired

    private SysUserMapper userMapper;



    @Autowired

    private SysDeptMapper deptMapper;



    @Autowired

    private SysUserDeptMapper userDeptMapper;



    @Autowired

    @Lazy

    private ISysNoticeService sysNoticeService;



    @Autowired

    private UnipushService unipushService;

    private final SysNoticeMapper noticeMapper;

    private final SysUserMapper userMapper;

    private final SysDeptMapper deptMapper;

    private final SysUserDeptMapper userDeptMapper;



    /**

     * 查询公告信息

@@ -149,14 +129,10 @@
        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))

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

                .collect(Collectors.toList());

        sysNoticeService.saveBatch(sysNotices);

        try {

            unipushService.sendClientMessage(sysNotices);

        } catch (Exception e) {

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

        }

        noticeMapper.insert(sysNotices);

        log.info("公告已保存至数据库，推送功能已禁用");

    }



    @Override

@@ -203,17 +179,12 @@
                        it.getUserId(),

                        it.getTenantId(),

                        jumpPath,

                        unipushService.convertWebPathToAppPath(jumpPath),

                        jumpPath,

                        userId

                ))

                .collect(Collectors.toList());



        sysNoticeService.saveBatch(collect);

        try {

            unipushService.sendClientMessage(collect);

        } catch (Exception e) {

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

        }

        noticeMapper.insert(collect);

        log.info("公告已保存至数据库，推送功能已禁用");

    }