diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java index 981c85a..e2a7c21 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteNoticeServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.system.dubbo; +import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; @@ -9,9 +10,12 @@ import org.dromara.resource.api.RemoteMessageService; import org.dromara.system.api.RemoteNoticeService; import org.dromara.system.api.domain.bo.RemoteNoticeBo; import org.dromara.system.domain.SysNotice; +import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.mapper.SysNoticeMapper; +import org.dromara.system.service.ISysDictTypeService; import org.springframework.stereotype.Service; +import java.util.List; /** @@ -27,12 +31,16 @@ public class RemoteNoticeServiceImpl implements RemoteNoticeService { private final SysNoticeMapper sysNoticeMapper; @DubboReference private final RemoteMessageService remoteMessageService; + private final ISysDictTypeService dictTypeService; @Override public int saveNotice(RemoteNoticeBo bo) { SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); /*String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType());*/ - remoteMessageService.publishAll(bo.getParam()); + List data = dictTypeService.selectDictDataByType("ai_push"); + List list = data.stream().map(SysDictDataVo::getDictValue).distinct().toList().stream().map(Long::parseLong).toList(); + //获取字典值 + remoteMessageService.publishMessage(list,bo.getParam()); return sysNoticeMapper.insert(notice); } }