Skip to content

E
email
Commit d82a5b6f by chentianzhong
Options

1111

parent 43bb2429
Showing with 63 additions and 58 deletions
pom.xml
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<properties> <properties>
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
<logging.level>debug</logging.level> <logging.level>debug</logging.level>
<eureka.server.url>http://admin:GXfy2021@172.18.4.84:8800/eureka/</eureka.server.url> <eureka.server.url>http://admin:GXfy2021@172.18.4.171:8800/eureka/</eureka.server.url>
</properties> </properties>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
......
src/main/java/com/zq/email/feign/MessageFeignClient.java
...@@ -42,7 +42,7 @@ public interface MessageFeignClient { ...@@ -42,7 +42,7 @@ public interface MessageFeignClient {
* @param params * @param params
* @return * @return
*/ */
@DeleteMapping("/web/revokeWebBySysInfo") @PostMapping("/web/revokeWebBySysInfo")
ResultVo revokeWebBySysInfo(@RequestBody Map<String, Object> params); ResultVo revokeWebBySysInfo(@RequestBody Map<String, Object> params);
/** /**
...@@ -52,7 +52,7 @@ public interface MessageFeignClient { ...@@ -52,7 +52,7 @@ public interface MessageFeignClient {
* @param params * @param params
* @return * @return
*/ */
@DeleteMapping("/todo/revokeTodoBySysInfo") @PostMapping("/todo/revokeTodoBySysInfo")
ResultVo revokeTodoBySysInfo(@RequestBody Map<String, Object> params); ResultVo revokeTodoBySysInfo(@RequestBody Map<String, Object> params);
} }
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
...@@ -109,8 +109,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -109,8 +109,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (page!=null && CollectionUtil.isNotEmpty(page.getRecords())){ if (page!=null && CollectionUtil.isNotEmpty(page.getRecords())){
for (EmailPerson record : page.getRecords()) { for (EmailPerson record : page.getRecords()) {
EmailContent byId = this.emailContentService.getById(record.getEmailContentId()); EmailContent byId = this.emailContentService.getById(record.getEmailContentId());
record.setEmailContent(byId);
record.setEmailContent(this.emailContentService.getById(record.getEmailContentId()));
} }
} }
return page; return page;
...@@ -150,9 +149,13 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -150,9 +149,13 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (CollectionUtil.isNotEmpty(receiverList)){ if (CollectionUtil.isNotEmpty(receiverList)){
this.saveEmailReceiver(receiverList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), vo.getIsSend()); this.saveEmailReceiver(receiverList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), vo.getIsSend());
//发送短信 //发送短信
smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId()); if (content.getSmsRemind() != null && content.getSmsRemind() == 1) {
smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
//代办 //代办
msgUtil.sendMsg(content, receiverList, systemInfo); if (content.getMessageRemind() != null && content.getMessageRemind() == 1) {
msgUtil.sendMsg(adminContext.getNickName(), content, receiverList, systemInfo);
}
} }
} }
...@@ -165,13 +168,17 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -165,13 +168,17 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
deptUserList.addAll(userByDeptId.getData()); deptUserList.addAll(userByDeptId.getData());
} }
if (CollectionUtil.isNotEmpty(deptUserList)){ if (CollectionUtil.isNotEmpty(deptUserList)) {
//增加收件人 //增加收件人
this.saveEmailReceiver(deptUserList, content, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey().longValue(), WhetherEnum.NO.getKey(), vo.getIsSend()); this.saveEmailReceiver(deptUserList, content, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey().longValue(), WhetherEnum.NO.getKey(), vo.getIsSend());
//短信 //短信
smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId()); if (content.getSmsRemind() != null && content.getSmsRemind() == 1){
smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
//代办 //代办
msgUtil.sendMsg(content, deptUserList, systemInfo); if (content.getMessageRemind() != null && content.getMessageRemind() == 1) {
msgUtil.sendMsg(adminContext.getNickName(), content, deptUserList, systemInfo);
}
} }
} }
...@@ -555,49 +562,51 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -555,49 +562,51 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
OnlineUserDto adminContext = TokenUtils.getAdminContext(); OnlineUserDto adminContext = TokenUtils.getAdminContext();
AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！"); AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！");
switch (EmailFolderEnum.getEnumByKey(vo.getFolderId())){ if (EmailFolderEnum.getEnumByKey(vo.getFolderId()) != null) {
case FOLDER_INBOX: //收件箱 switch (EmailFolderEnum.getEnumByKey(vo.getFolderId())) {
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE); case FOLDER_INBOX: //收件箱
vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.YES.getKey());
vo.setUserId(adminContext.getUserId());
break;
case FOLDER_DEPT_INBOX: //部门邮件
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
vo.setIsPerson(WhetherEnum.NO.getKey());
vo.setIsSend(WhetherEnum.YES.getKey());
vo.setUserId(adminContext.getUserId());
break;
case FOLDER_OUTBOX: //草稿箱
vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.NO.getKey());
vo.setUserId(adminContext.getUserId());
break;
case FOLDER_ALREADY_SEND: //已发送
if (vo.getSendUserId()!=null){
vo.setFolderId(null);
vo.setUserId(vo.getSendUserId());
vo.setSendUserId(adminContext.getUserId());
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE); vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
//vo.setIsPerson(WhetherEnum.YES.getKey()); vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.YES.getKey());
vo.setUserId(adminContext.getUserId());
break;
case FOLDER_DEPT_INBOX: //部门邮件
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
vo.setIsPerson(WhetherEnum.NO.getKey());
vo.setIsSend(WhetherEnum.YES.getKey()); vo.setIsSend(WhetherEnum.YES.getKey());
}else{
vo.setUserId(adminContext.getUserId()); vo.setUserId(adminContext.getUserId());
break;
case FOLDER_OUTBOX: //草稿箱
vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND); vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
//vo.setIsPerson(WhetherEnum.YES.getKey()); vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.NO.getKey());
vo.setUserId(adminContext.getUserId());
break;
case FOLDER_ALREADY_SEND: //已发送
if (vo.getSendUserId() != null) {
vo.setFolderId(null);
vo.setUserId(vo.getSendUserId());
vo.setSendUserId(adminContext.getUserId());
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
//vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.YES.getKey());
} else {
vo.setUserId(adminContext.getUserId());
vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
//vo.setIsPerson(WhetherEnum.YES.getKey());
vo.setIsSend(WhetherEnum.YES.getKey());
}
break;
case FOLDER_ALREADY_DELETE: //回收站
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
vo.setIsSend(WhetherEnum.YES.getKey()); vo.setIsSend(WhetherEnum.YES.getKey());
} break;
break; default: //其他文件夹
case FOLDER_ALREADY_DELETE: //回收站
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
vo.setIsSend(WhetherEnum.YES.getKey());
break;
default: //其他文件夹
vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE); vo.setPersonType(EmailConstant.TYPE_EMAIL_RECEIVE);
vo.setIsSend(WhetherEnum.YES.getKey()); vo.setIsSend(WhetherEnum.YES.getKey());
break; break;
}
} }
vo.setUserId(adminContext.getUserId()); vo.setUserId(adminContext.getUserId());
Page<EmailPerson> page = new Page<>(vo.getPage(), vo.getSize()); Page<EmailPerson> page = new Page<>(vo.getPage(), vo.getSize());
...@@ -686,8 +695,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -686,8 +695,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
//短信 //短信
smsUtil.sendBatchSms(toUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId()); smsUtil.sendBatchSms(toUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
//代办 //代办
msgUtil.sendMsg(content, toUserList, systemInfo); msgUtil.sendMsg(fromVo.getData().getNickName(), content, toUserList, systemInfo);
return content; return content;
} }
...@@ -717,7 +725,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -717,7 +725,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
} }
if (CollectionUtil.isNotEmpty(receiverList)){ if (CollectionUtil.isNotEmpty(receiverList)){
smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId()); smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
msgUtil.sendMsg(content, receiverList, systemInfo); msgUtil.sendMsg(formUser.getNickName(), content, receiverList, systemInfo);
} }
} }
...@@ -733,7 +741,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -733,7 +741,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (CollectionUtil.isNotEmpty(deptUserList)){ if (CollectionUtil.isNotEmpty(deptUserList)){
smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId()); smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
msgUtil.sendMsg(content, deptUserList, systemInfo); msgUtil.sendMsg(formUser.getNickName(), content, deptUserList, systemInfo);
} }
} }
} }
......
src/main/java/com/zq/email/utils/MsgUtil.java
...@@ -35,15 +35,12 @@ public class MsgUtil { ...@@ -35,15 +35,12 @@ public class MsgUtil {
@Resource @Resource
public MessageFeignClient messageFeignClient; public MessageFeignClient messageFeignClient;
/**
* 发送批量短信
*
* @return
*/
@Async @Async
public void sendMsg(EmailContent content, List<CustomerUserVo> userVoList, SystemInfo systemInfo) { public void sendMsg(String sender, EmailContent content, List<CustomerUserVo> userVoList, SystemInfo systemInfo) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params .put("systemTag", EmailConstant.SYSTEM_TAG); params .put("systemTag", EmailConstant.SYSTEM_TAG);
params .put("sender", sender);
params .put("nickName", sender);
params .put("title","您有一封新邮件提醒"); params .put("title","您有一封新邮件提醒");
params .put("content", "您有一封新的邮件，标题为《"+content.getTitle()+"》。请及时查收。"); params .put("content", "您有一封新的邮件，标题为《"+content.getTitle()+"》。请及时查收。");
params.put("userIdList", userVoList.stream().map(e->e.getUserId()).collect(Collectors.toList())); params.put("userIdList", userVoList.stream().map(e->e.getUserId()).collect(Collectors.toList()));
......
src/main/resources/application-dev.yml
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
redis: redis:
#数据库索引 #数据库索引
database: 0 database: 0
host: 172.18.4.84 host: 172.18.4.171
port: 6379 port: 6379
password: password:
#连接超时时间 #连接超时时间
...@@ -11,7 +11,7 @@ spring: ...@@ -11,7 +11,7 @@ spring:
datasource: datasource:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:kingbase8://172.18.4.84:54321/EMAIL_NEW url: jdbc:kingbase8://172.18.4.171:54321/EMAIL_NEW
username: oa_system username: oa_system
password: 123456 password: 123456
driver-class-name: com.kingbase8.Driver driver-class-name: com.kingbase8.Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment