diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java index c2fff036..76dc5c6a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java @@ -9,6 +9,7 @@ public class MessageTemplateCodeCommon { private MessageTemplateCodeCommon() {} - public static final String LAWS_NEWS_FEED = "laws_news_feed"; // 动态消息 + public static final String LAWS_NEWS_FEED = "laws_news_feed"; // 【动态消息】通知 + public static final String LAWS_PROBLEM_LIBRARY = "laws_problem_library"; // 【问答库】回答已置顶 } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java index 328820ba..1e0a176d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java @@ -3,8 +3,12 @@ package com.jero.modules.laws.library.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.laws.common.constant.DictCommon; +import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.library.entity.LawsAnswerLibrary; @@ -13,6 +17,7 @@ import com.jero.modules.laws.library.mapper.LawsProblemLibraryMapper; import com.jero.modules.laws.library.service.ILawsAnswerLibraryService; import com.jero.modules.laws.library.service.ILawsProblemLibraryService; import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; @@ -23,9 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import java.util.Objects; + +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -53,6 +57,8 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl queryPage(LawsProblemLibrary lawsProblemLibrary, Integer pageNo, Integer pageSize, @@ -201,9 +207,29 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("standardNumber", lawsProblemLibrary.getStandardNumber()); + map.put("standardName", lawsProblemLibrary.getStandardName()); + map.put("title", lawsProblemLibrary.getTitle()); + sendMessageDTO.setMap(map); + sendMessageAPI.sendMessage(sendMessageDTO); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java index 0a5eff8f..a363ff30 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java @@ -8,6 +8,7 @@ import com.jero.modules.laws.common.constant.DictCommon; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.standard.entity.LawsNewsFeed; import com.jero.modules.laws.standard.entity.LawsPushRange; import com.jero.modules.laws.standard.mapper.LawsNewsFeedMapper; @@ -169,25 +170,34 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("title", lawsNewsFeed.getDynamicHeading()); - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SysDictItem::getItemValue, lawsNewsFeed.getDynamicClassification()); - lambdaQueryWrapper.eq(SysDictItem::getDictId, DictCommon.DYNAMIC_NEWS_TYPE_ID); - SysDictItem sysDictItem = sysDictItemService.getOne(lambdaQueryWrapper); - - map.put("type", sysDictItem.getItemText()); - map.put("name", loginUser.getRealname()); - sendMessageDTO.setMap(map); - sendMessageAPI.sendMessage(sendMessageDTO); + sendMsg(pushRange, lawsNewsFeed); } } } + /** + * @Author: liao + * @Date: 2023/11/10 15:20 + * @Description: 发送消息 + **/ + private void sendMsg(String pushRange, LawsNewsFeed lawsNewsFeed) { + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.LAWS_NEWS_FEED); + sendMessageDTO.setToUserId(pushRange); + Map map = new HashMap<>(); + map.put("title", lawsNewsFeed.getDynamicHeading()); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysDictItem::getItemValue, lawsNewsFeed.getDynamicClassification()); + lambdaQueryWrapper.eq(SysDictItem::getDictId, DictCommon.DYNAMIC_NEWS_TYPE_ID); + SysDictItem sysDictItem = sysDictItemService.getOne(lambdaQueryWrapper); + + map.put("type", sysDictItem.getItemText()); + map.put("name", CurrentUserUtil.getRealName()); + sendMessageDTO.setMap(map); + sendMessageAPI.sendMessage(sendMessageDTO); + } + /** * 通过id删除 *