diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/dto/SendMessageDTO.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/SendMessageDTO.java similarity index 91% rename from laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/dto/SendMessageDTO.java rename to laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/SendMessageDTO.java index 678df842..206b8caf 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/dto/SendMessageDTO.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/SendMessageDTO.java @@ -1,4 +1,4 @@ -package com.jero.modules.docking.hiwork.dto; +package com.jero.common.api.dto.message; import lombok.Data; diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java new file mode 100644 index 00000000..0474e634 --- /dev/null +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java @@ -0,0 +1,19 @@ +package com.jero.common.api.vo; + +import com.jero.common.api.dto.message.SendMessageDTO; + +/** + * @Author: liao + * @Date: 2023/10/27 15:15 + * @Description: 发送消息 + */ +public interface SendMessageAPI { + + /** + * @Author: liao + * @Date: 2023/10/27 15:13 + * @Description: 根据模板发送消息 + **/ + void sendMessage(SendMessageDTO sendMessageDTO); + +} diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/ISendMessageService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/ISendMessageService.java deleted file mode 100644 index eb1e8f48..00000000 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/ISendMessageService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jero.modules.docking.hiwork.service; - -import com.jero.modules.docking.hiwork.dto.SendMessageDTO; - -/** - * @Author: liao - * @Date: 2023/10/17 11:22 - * @Description: 发送消息 - */ -public interface ISendMessageService { - - /** - * @Author: liao - * @Date: 2023/10/17 11:24 - * @Description: 根据模板发送消息 - **/ - void sendMessage(SendMessageDTO sendMessageDTO); - -} diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java index 74cf0918..650eb831 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java @@ -1,17 +1,18 @@ package com.jero.modules.docking.hiwork.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.exception.JeroBootException; -import com.jero.modules.docking.hiwork.dto.SendMessageDTO; import com.jero.modules.docking.hiwork.handle.DingDingSendMsgHandle; import com.jero.modules.docking.hiwork.handle.SystemSendMsgHandle; -import com.jero.modules.docking.hiwork.service.ISendMessageService; import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.handle.ISendMsgHandle; import com.jero.modules.message.service.ISysMessageTemplateService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -26,10 +27,12 @@ import java.util.Objects; */ @Slf4j @Service -public class SendMessageServiceImpl implements ISendMessageService { +public class SendMessageServiceImpl implements SendMessageAPI { @Resource private ISysMessageTemplateService sysMessageTemplateService; + @Value("${hiwork.isSend}") + private Boolean isSend; /** * @Author: liao @@ -72,8 +75,11 @@ public class SendMessageServiceImpl implements ISendMessageService { } else { return; } + log.info("消息标题:{},消息内容:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent()); + if (!isSend) { + return; + } sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent()); - log.info(sysMessageTemplate.getTemplateContent()); } catch (Exception e){ log.error("发送消息异常",e); throw new JeroBootException("发送消息异常"); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java index 47cf37e8..53bfe468 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java @@ -81,7 +81,7 @@ public class LawsNewsFeedController extends JeroController { * @param lawsNewsFeed * @return */ - void add(LawsNewsFeed lawsNewsFeed); + void add(LawsNewsFeed lawsNewsFeed, String type); /** * 通过id删除 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 5227d098..f72c38d6 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 @@ -1,8 +1,8 @@ package com.jero.modules.laws.standard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.api.vo.Result; +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.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; @@ -11,7 +11,8 @@ import com.jero.modules.laws.standard.entity.LawsPushRange; import com.jero.modules.laws.standard.mapper.LawsNewsFeedMapper; import com.jero.modules.laws.standard.service.ILawsNewsFeedService; import com.jero.modules.laws.standard.service.ILawsPushRangeService; -import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.ISysDictItemService; import com.spire.ms.System.Collections.ArrayList; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -21,15 +22,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; -import java.util.Arrays; -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; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -48,6 +44,10 @@ 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, "1704331613726781442"); + SysDictItem sysDictItem = sysDictItemService.getOne(lambdaQueryWrapper); + + map.put("type", sysDictItem.getItemText()); + map.put("name", loginUser.getRealname()); + sendMessageDTO.setMap(map); + sendMessageAPI.sendMessage(sendMessageDTO); + } } } diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index d9b4245b..5997f061 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -384,6 +384,8 @@ hiwork: todoUrl: taskapi/task.basedata/integrationCall/workflowIntegration # 统一消息集成 messageUrl: taskapi/task.basedata/notice/noticeCalls/send + # 是否发送消息 + isSend: false # 汽车标准数字化平台ASMS asms: