Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
email
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈天仲
email
Commits
f00b9e36
Commit
f00b9e36
authored
Apr 12, 2023
by
chentianzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2023年4月12日18:02:51
parent
dbdc6995
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
9 deletions
+30
-9
pom.xml
+1
-1
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
+26
-6
src/main/resources/application-product.yml
+1
-1
src/main/resources/logback-spring.xml
+2
-1
No files found.
pom.xml
View file @
f00b9e36
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
<properties>
<properties>
<profiles.active>
local
</profiles.active>
<profiles.active>
local
</profiles.active>
<logging.level>
debug
</logging.level>
<logging.level>
debug
</logging.level>
<eureka.server.url>
http://admin:GXfy2021@1
27.0.0.
1:8800/eureka/
</eureka.server.url>
<eureka.server.url>
http://admin:GXfy2021@1
72.18.4.17
1:8800/eureka/
</eureka.server.url>
</properties>
</properties>
</profile>
</profile>
<profile>
<profile>
...
...
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
View file @
f00b9e36
package
com
.
zq
.
email
.
service
.
impl
;
package
com
.
zq
.
email
.
service
.
impl
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.AssertUtils
;
...
@@ -104,7 +106,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -104,7 +106,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
}
}
//queryWrapper.orderByAsc(EmailPerson::getIsRead).orderByDesc(EmailPerson::getSendTime);
//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
);
page
=
this
.
page
(
page
,
queryWrapper
);
if
(
page
!=
null
&&
CollectionUtil
.
isNotEmpty
(
page
.
getRecords
())){
if
(
page
!=
null
&&
CollectionUtil
.
isNotEmpty
(
page
.
getRecords
())){
...
@@ -428,25 +430,33 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -428,25 +430,33 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if
(
type
.
equals
(
WhetherEnum
.
YES
.
getKey
())){
//下
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
.
lt
(
EmailPerson:
:
getSendTime
,
currentPerson
.
getSendTime
());
queryWrapper
.
ge
(
EmailPerson:
:
getSendTime
,
DateUtils
.
getRangeStart
(
vo
.
getSearchRange
()));
queryWrapper
.
orderByDesc
(
EmailPerson:
:
getSendTime
);
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
())){
//上
}
else
if
(
type
.
equals
(
WhetherEnum
.
NO
.
getKey
())){
//上
queryWrapper
.
lt
(
EmailPerson:
:
getSendTime
,
LocalDateTime
.
now
());
queryWrapper
.
gt
(
EmailPerson:
:
getSendTime
,
currentPerson
.
getSendTime
());
queryWrapper
.
gt
(
EmailPerson:
:
getSendTime
,
currentPerson
.
getSendTime
());
queryWrapper
.
lt
(
EmailPerson:
:
getSendTime
,
LocalDateTime
.
now
());
queryWrapper
.
orderByAsc
(
EmailPerson:
:
getSendTime
);
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
{
}
else
{
AssertUtils
.
isTrue
(
false
,
"向上或向下查询参数不对"
);
AssertUtils
.
isTrue
(
false
,
"向上或向下查询参数不对"
);
}
}
//log.info(">>>>> folderId:{}", vo.getFolderId());
Page
<
EmailPerson
>
queryPage
=
new
Page
<>(
1
,
5
);
Page
<
EmailPerson
>
queryPage
=
new
Page
<>(
1
,
5
);
queryPage
.
setSearchCount
(
false
);
queryPage
.
setSearchCount
(
false
)
.
setOptimizeCountSql
(
false
)
;
//List<EmailPerson> list = this.list(queryWrapper);
//List<EmailPerson> list = this.list(queryWrapper);
//EmailPerson person = this.getOne(queryWrapper, false); 分析下getone的sql是list后取第一条还是top(1)
//EmailPerson person = this.getOne(queryWrapper, false); 分析下getone的sql是list后取第一条还是top(1)
Page
<
EmailPerson
>
page
=
this
.
page
(
queryPage
,
queryWrapper
);
Page
<
EmailPerson
>
page
=
this
.
page
(
queryPage
,
queryWrapper
);
if
(
page
!=
null
&&
CollectionUtil
.
isNotEmpty
(
page
.
getRecords
())){
if
(
page
!=
null
&&
CollectionUtil
.
isNotEmpty
(
page
.
getRecords
())){
//log.info(">>>>> 返回结果:{}", JSONUtil.toJsonStr(page.getRecords()));
EmailPerson
person
=
page
.
getRecords
().
get
(
0
);
EmailPerson
person
=
page
.
getRecords
().
get
(
0
);
if
(
person
!=
null
){
if
(
person
!=
null
){
EmailContent
content
=
this
.
emailContentService
.
getById
(
person
.
getEmailContentId
());
EmailContent
content
=
this
.
emailContentService
.
getById
(
person
.
getEmailContentId
());
...
@@ -455,7 +465,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -455,7 +465,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
return
person
;
return
person
;
}
}
}
}
//log.info(">>>>> 返回结果:null");
return
null
;
return
null
;
}
}
...
@@ -700,7 +710,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -700,7 +710,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
ArrayList
<
CustomerUserVo
>
toUserList
=
new
ArrayList
<>(
toUserSet
);
ArrayList
<
CustomerUserVo
>
toUserList
=
new
ArrayList
<>(
toUserSet
);
this
.
saveEmailReceiver
(
toUserList
,
content
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
YES
.
getKey
(),
WhetherEnum
.
YES
.
getKey
());
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
());
msgUtil
.
sendMsg
(
fromVo
.
getData
().
getNickName
(),
content
,
toUserList
,
systemInfo
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
());
return
content
;
return
content
;
...
@@ -731,10 +741,15 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -731,10 +741,15 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
receiverList
.
add
(
receiver
);
receiverList
.
add
(
receiver
);
}
}
if
(
CollectionUtil
.
isNotEmpty
(
receiverList
)){
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
());
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
());
msgUtil
.
sendMsg
(
formUser
.
getNickName
(),
content
,
receiverList
,
systemInfo
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
());
}
}
}
}
}
//收件部门人员
//收件部门人员
...
@@ -747,11 +762,16 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -747,11 +762,16 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
}
}
if
(
CollectionUtil
.
isNotEmpty
(
deptUserList
)){
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
());
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
());
msgUtil
.
sendMsg
(
formUser
.
getNickName
(),
content
,
deptUserList
,
systemInfo
,
EmailFolderEnum
.
FOLDER_DEPT_INBOX
.
getKey
());
}
}
}
}
}
}
}
return
content
;
return
content
;
}
}
...
...
src/main/resources/application-product.yml
View file @
f00b9e36
...
@@ -10,7 +10,7 @@ spring:
...
@@ -10,7 +10,7 @@ spring:
datasource
:
datasource
:
druid
:
druid
:
db-type
:
com.alibaba.druid.pool.DruidDataSource
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
username
:
oa_system
password
:
GXfy/2014!@#$
password
:
GXfy/2014!@#$
driver-class-name
:
com.kingbase8.Driver
driver-class-name
:
com.kingbase8.Driver
...
...
src/main/resources/logback-spring.xml
View file @
f00b9e36
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
<contextName>
logback
</contextName>
<contextName>
logback
</contextName>
<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<!-- 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/"/>-->
<!-- <property name="log.path" value="D:/seallog/"/>-->
<!--主要日志文件名-->
<!--主要日志文件名-->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment