Merge dev_New_pro into dev_山西_晋和园_pro

gongchunyi

3 天以前 10b88a7ff17caf92f3d4e8a550c1085a70c2517a

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

@@ -17,6 +17,7 @@
import com.ruoyi.project.system.mapper.SysUserMapper;

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;



@@ -32,6 +33,7 @@
 *

 * @author ruoyi

 */

@Slf4j

@Service

@RequiredArgsConstructor

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

@@ -159,14 +161,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());

        noticeMapper.insert(sysNotices);

        try {

            unipushService.sendClientMessage(sysNotices);

        } catch (Exception e) {

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

        }

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

    }



    @Override

@@ -213,16 +211,12 @@
                        it.getUserId(),

                        it.getTenantId(),

                        jumpPath,

                        unipushService.convertWebPathToAppPath(jumpPath),

                        jumpPath,

                        userId

                ))

                .collect(Collectors.toList());

        noticeMapper.insert(collect);

        try {

            unipushService.sendClientMessage(collect);

        } catch (Exception e) {

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

        }

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

    }