|
@@ -104,7 +104,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
PageInfo<SysMessageDto> pageInfo = new PageInfo<SysMessageDto>(queryInfo.getPage(), queryInfo.getRows());
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
-
|
|
|
+
|
|
|
List<SysMessageDto> dataList = null;
|
|
|
int count = this.findCount(params);
|
|
|
if (count > 0) {
|
|
@@ -314,7 +314,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
}
|
|
|
// email data from database load, 使用接收者 tenantId, 假设发送者和接收者为同一机构
|
|
|
if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
|
|
|
- loadEmailInfo(null, receivers.values().stream().findFirst().orElse(null));
|
|
|
+ Integer userId = receivers.keySet().stream().findFirst().orElse(-1);
|
|
|
+ loadEmailInfo(userId);
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(jpushType) && jpushType == "STUDENT"){
|
|
|
//如果不是缴费信息
|
|
@@ -355,6 +356,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
if (triggerTime == null || date.after(triggerTime)) {
|
|
|
status = SendStatusEnum.SENDING;
|
|
|
try {
|
|
|
+ debugMode = false;
|
|
|
if (debugMode == true
|
|
|
|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
|
|
|
MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null)) {
|
|
@@ -451,7 +453,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
}
|
|
|
// email data from database load
|
|
|
if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
|
|
|
- loadEmailInfo(userId, receiver);
|
|
|
+ loadEmailInfo(userId);
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
SendStatusEnum status = SendStatusEnum.WAIT;
|
|
@@ -482,33 +484,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
|
|
|
}
|
|
|
|
|
|
- private Integer getTenantIdByUser(Integer userId, String receiver) throws BizException {
|
|
|
- SysUser user;
|
|
|
- if (userId == null) {
|
|
|
- user = sysUserFeignService.queryUserByMobile(receiver);
|
|
|
- if (user != null) {
|
|
|
- return user.getTenantId();
|
|
|
- } // user query null using receiver query
|
|
|
- }
|
|
|
-
|
|
|
- user = sysUserFeignService.queryUserByMobile(receiver);
|
|
|
- if (user != null) {
|
|
|
- return user.getTenantId();
|
|
|
- } else {
|
|
|
- throw new BizException("找不到发送者用户 id: " + userId.toString() + " 接收者 " + receiver);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private void loadEmailInfo(Integer userId, String receiver) {
|
|
|
- Integer tenantId = getTenantIdByUser(userId, receiver);
|
|
|
- SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", tenantId).queryWrapper());
|
|
|
+ private void loadEmailInfo(Integer userId) {
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
+ SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
|
|
|
messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
|
|
|
messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
|
|
|
messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
|
|
|
messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
|
|
|
messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
|
|
|
messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@Override
|