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
d82a5b6f
Commit
d82a5b6f
authored
Mar 28, 2023
by
chentianzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1111
parent
43bb2429
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
23 deletions
+28
-23
pom.xml
+1
-1
src/main/java/com/zq/email/feign/MessageFeignClient.java
+2
-2
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
+20
-12
src/main/java/com/zq/email/utils/MsgUtil.java
+3
-6
src/main/resources/application-dev.yml
+2
-2
No files found.
pom.xml
View file @
d82a5b6f
...
...
@@ -243,7 +243,7 @@
<properties>
<profiles.active>
dev
</profiles.active>
<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>
<activation>
<activeByDefault>
true
</activeByDefault>
...
...
src/main/java/com/zq/email/feign/MessageFeignClient.java
View file @
d82a5b6f
...
...
@@ -42,7 +42,7 @@ public interface MessageFeignClient {
* @param params
* @return
*/
@
Delete
Mapping
(
"/web/revokeWebBySysInfo"
)
@
Post
Mapping
(
"/web/revokeWebBySysInfo"
)
ResultVo
revokeWebBySysInfo
(
@RequestBody
Map
<
String
,
Object
>
params
);
/**
...
...
@@ -52,7 +52,7 @@ public interface MessageFeignClient {
* @param params
* @return
*/
@
Delete
Mapping
(
"/todo/revokeTodoBySysInfo"
)
@
Post
Mapping
(
"/todo/revokeTodoBySysInfo"
)
ResultVo
revokeTodoBySysInfo
(
@RequestBody
Map
<
String
,
Object
>
params
);
}
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
View file @
d82a5b6f
...
...
@@ -109,8 +109,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if
(
page
!=
null
&&
CollectionUtil
.
isNotEmpty
(
page
.
getRecords
())){
for
(
EmailPerson
record
:
page
.
getRecords
())
{
EmailContent
byId
=
this
.
emailContentService
.
getById
(
record
.
getEmailContentId
());
record
.
setEmailContent
(
this
.
emailContentService
.
getById
(
record
.
getEmailContentId
()));
record
.
setEmailContent
(
byId
);
}
}
return
page
;
...
...
@@ -150,9 +149,13 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if
(
CollectionUtil
.
isNotEmpty
(
receiverList
)){
this
.
saveEmailReceiver
(
receiverList
,
content
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
YES
.
getKey
(),
vo
.
getIsSend
());
//发送短信
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
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
());
//短信
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,7 +562,8 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
OnlineUserDto
adminContext
=
TokenUtils
.
getAdminContext
();
AssertUtils
.
notNull
(
adminContext
,
"登录已失效,请重新登录后再次尝试!"
);
switch
(
EmailFolderEnum
.
getEnumByKey
(
vo
.
getFolderId
())){
if
(
EmailFolderEnum
.
getEnumByKey
(
vo
.
getFolderId
())
!=
null
)
{
switch
(
EmailFolderEnum
.
getEnumByKey
(
vo
.
getFolderId
()))
{
case
FOLDER_INBOX:
//收件箱
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_RECEIVE
);
vo
.
setIsPerson
(
WhetherEnum
.
YES
.
getKey
());
...
...
@@ -576,14 +584,14 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
break
;
case
FOLDER_ALREADY_SEND:
//已发送
if
(
vo
.
getSendUserId
()!=
null
)
{
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
{
}
else
{
vo
.
setUserId
(
adminContext
.
getUserId
());
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_SEND
);
//vo.setIsPerson(WhetherEnum.YES.getKey());
...
...
@@ -599,6 +607,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
break
;
}
}
vo
.
setUserId
(
adminContext
.
getUserId
());
Page
<
EmailPerson
>
page
=
new
Page
<>(
vo
.
getPage
(),
vo
.
getSize
());
page
=
this
.
baseMapper
.
selectSearchPage
(
page
,
vo
);
...
...
@@ -686,8 +695,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
//短信
smsUtil
.
sendBatchSms
(
toUserList
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收。"
,
content
.
getId
());
//代办
msgUtil
.
sendMsg
(
content
,
toUserList
,
systemInfo
);
msgUtil
.
sendMsg
(
fromVo
.
getData
().
getNickName
(),
content
,
toUserList
,
systemInfo
);
return
content
;
}
...
...
@@ -717,7 +725,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
}
if
(
CollectionUtil
.
isNotEmpty
(
receiverList
)){
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
if
(
CollectionUtil
.
isNotEmpty
(
deptUserList
)){
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
View file @
d82a5b6f
...
...
@@ -35,15 +35,12 @@ public class MsgUtil {
@Resource
public
MessageFeignClient
messageFeignClient
;
/**
* 发送批量短信
*
* @return
*/
@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
<>();
params
.
put
(
"systemTag"
,
EmailConstant
.
SYSTEM_TAG
);
params
.
put
(
"sender"
,
sender
);
params
.
put
(
"nickName"
,
sender
);
params
.
put
(
"title"
,
"您有一封新邮件提醒"
);
params
.
put
(
"content"
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()+
"》。请及时查收。"
);
params
.
put
(
"userIdList"
,
userVoList
.
stream
().
map
(
e
->
e
.
getUserId
()).
collect
(
Collectors
.
toList
()));
...
...
src/main/resources/application-dev.yml
View file @
d82a5b6f
...
...
@@ -3,7 +3,7 @@ spring:
redis
:
#数据库索引
database
:
0
host
:
172.18.4.
84
host
:
172.18.4.
171
port
:
6379
password
:
#连接超时时间
...
...
@@ -11,7 +11,7 @@ spring:
datasource
:
druid
:
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
password
:
123456
driver-class-name
:
com.kingbase8.Driver
...
...
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