KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

Browse Source
This commit is contained in:
danshihao
2023-03-07 16:22:28 +08:00
parent 1eb59a3fd6 6c03356a7e
commit f8c9ff5282
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java
+1 -4
View File
@@ -1,10 +1,7 @@
package com.jero.modules.message.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.message.entity.SysMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.message.entity.SysMessage;
/**
* @Description: 消息
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java
+5 -10
View File
@@ -1,19 +1,17 @@
package com.jero.modules.message.util;
import com.alibaba.fastjson.JSON;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import com.jero.modules.message.entity.SysMessage;
import com.jero.modules.message.entity.SysMessageTemplate;
import com.jero.modules.message.handle.enums.SendMsgStatusEnum;
import com.jero.modules.message.service.ISysMessageService;
import com.jero.modules.message.service.ISysMessageTemplateService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Date;
@@ -44,7 +42,7 @@ public class PushMsgUtil {
public boolean sendMessage(String msgType, String templateCode, Map<String, String> map, String sentTo) {
List<SysMessageTemplate> sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode);
SysMessage sysMessage = new SysMessage();
if (sysSmsTemplates.size() > 0) {
if (!sysSmsTemplates.isEmpty()) {
SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0);
sysMessage.setEsType(msgType);
sysMessage.setEsReceiver(sentTo);
@@ -57,10 +55,7 @@ public class PushMsgUtil {
try {
template = new Template("SysMessageTemplate", content, freemarkerConfig);
template.process(map, stringWriter);
} catch (IOException e) {
e.printStackTrace();
return false;
} catch (TemplateException e) {
} catch (IOException |TemplateException e) {
e.printStackTrace();
return false;
}