Skip to content

E
email
Commit f00b9e36 by chentianzhong
Options

2023年4月12日18:02:51

parent dbdc6995
Showing with 30 additions and 9 deletions
pom.xml
......@@ -234,7 +234,7 @@
<properties>
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
<eureka.server.url>http://admin:GXfy2021@127.0.0.1:8800/eureka/</eureka.server.url>
<eureka.server.url>http://admin:GXfy2021@172.18.4.171:8800/eureka/</eureka.server.url>
</properties>
</profile>
<profile>
......
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
package com.zq.email.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zq.common.utils.AssertUtils;
......@@ -104,7 +106,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
}
//queryWrapper.orderByAsc(EmailPerson::getIsRead).orderByDesc(EmailPerson::getSendTime);
queryWrapper.orderByDesc(EmailPerson::getSendTime).orderByAsc(EmailPerson::getIsRead);
queryWrapper.orderByDesc(EmailPerson::getSendTime); //.orderByAsc(EmailPerson::getIsRead);
page = this.page(page, queryWrapper);
if (page!=null && CollectionUtil.isNotEmpty(page.getRecords())){
......@@ -428,25 +430,33 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (type.equals(WhetherEnum.YES.getKey())){ //下
queryWrapper.ge(DateUtils.getRangeStart(vo.getSearchRange())!=null, EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange()));
queryWrapper.lt(EmailPerson::getSendTime, currentPerson.getSendTime());
queryWrapper.ge(EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange()));
queryWrapper.orderByDesc(EmailPerson::getSendTime);
//log.info(">>下一封");
//log.info(">>>>> 大于：{}", DateUtil.format(DateUtils.getRangeStart(vo.getSearchRange()), "yyyy-MM-dd HH:mm:ss"));
//log.info(">>>>> 小于currentPerson时间：{}", DateUtil.format(currentPerson.getSendTime(), "yyyy-MM-dd HH:mm:ss"));
}else if (type.equals(WhetherEnum.NO.getKey())){ //上
queryWrapper.lt(EmailPerson::getSendTime, LocalDateTime.now());
queryWrapper.gt(EmailPerson::getSendTime, currentPerson.getSendTime());
queryWrapper.lt(EmailPerson::getSendTime, LocalDateTime.now());
queryWrapper.orderByAsc(EmailPerson::getSendTime);
//log.info(">>上一封");
//log.info(">>>>> 大于：{}", DateUtil.format(currentPerson.getSendTime(), "yyyy-MM-dd HH:mm:ss"));
//log.info(">>>>> 小于currentPerson时间：{}", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss"));
}else{
AssertUtils.isTrue(false, "向上或向下查询参数不对");
}
//log.info(">>>>> folderId：{}", vo.getFolderId());
Page<EmailPerson> queryPage = new Page<>(1, 5);
queryPage.setSearchCount(false);
queryPage.setSearchCount(false).setOptimizeCountSql(false);
//List<EmailPerson> list = this.list(queryWrapper);
//EmailPerson person = this.getOne(queryWrapper, false); 分析下getone的sql是list后取第一条还是top(1)
Page<EmailPerson> page = this.page(queryPage,queryWrapper);
if (page!=null &&CollectionUtil.isNotEmpty(page.getRecords())){
//log.info(">>>>> 返回结果：{}", JSONUtil.toJsonStr(page.getRecords()));
EmailPerson person = page.getRecords().get(0);
if (person!=null){
EmailContent content = this.emailContentService.getById(person.getEmailContentId());
......@@ -455,7 +465,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
return person;
}
}
//log.info(">>>>> 返回结果：null");
return null;
}
......@@ -700,7 +710,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
ArrayList<CustomerUserVo> toUserList = new ArrayList<>(toUserSet);
this.saveEmailReceiver(toUserList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), WhetherEnum.YES.getKey());
//短信
smsUtil.sendBatchSms(toUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
//smsUtil.sendBatchSms(toUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
//代办
msgUtil.sendMsg(fromVo.getData().getNickName(), content, toUserList, systemInfo, EmailFolderEnum.FOLDER_INBOX.getKey());
return content;
......@@ -731,10 +741,15 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
receiverList.add(receiver);
}
if (CollectionUtil.isNotEmpty(receiverList)){
this.saveEmailReceiver(receiverList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), WhetherEnum.YES.getKey());
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())) {
smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getMessageRemind().equals(WhetherEnum.YES.getKey())) {
msgUtil.sendMsg(formUser.getNickName(), content, receiverList, systemInfo, EmailFolderEnum.FOLDER_INBOX.getKey());
}
}
}
//收件部门人员
......@@ -747,11 +762,16 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
}
if (CollectionUtil.isNotEmpty(deptUserList)){
this.saveEmailReceiver(deptUserList, content, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey().longValue(), WhetherEnum.NO.getKey(), WhetherEnum.YES.getKey());
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())) {
smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
}
if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getMessageRemind().equals(WhetherEnum.YES.getKey())) {
msgUtil.sendMsg(formUser.getNickName(), content, deptUserList, systemInfo, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey());
}
}
}
}
return content;
}
......
src/main/resources/application-product.yml
......@@ -10,7 +10,7 @@ spring:
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:kingbase8://147.2.3.4:54321/EMAIL_TEST?ConfigurePath=/opt/db-config/EMAIL/jdbc_new.conf
url: jdbc:kingbase8://147.2.3.4:54321/EMAIL_NEW?ConfigurePath=/opt/db-config/EMAIL/jdbc_new.conf
username: oa_system
password: GXfy/2014!@#$
driver-class-name: com.kingbase8.Driver
......
src/main/resources/logback-spring.xml
......@@ -8,7 +8,8 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
<property name="log.path" value="/opt/oa-cloud/email/logs/"/>
<!-- <property name="log.path" value="/opt/oa-cloud/email/logs/"/>-->
<property name="log.path" value="/opt/services/oa-new/email/logs/"/>
<!-- <property name="log.path" value="D:/seallog/"/>-->
<!--主要日志文件名-->
......
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