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
43bb2429
Commit
43bb2429
authored
Mar 25, 2023
by
chentianzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发件和列表接口
parent
0cb1e4f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
39 deletions
+52
-39
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
+51
-39
src/main/java/com/zq/email/vo/EmailReqVo.java
+1
-0
No files found.
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
View file @
43bb2429
...
@@ -33,6 +33,8 @@ import com.zq.email.vo.api.EmailEditApiVo;
...
@@ -33,6 +33,8 @@ import com.zq.email.vo.api.EmailEditApiVo;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.mail.Session
;
import
javax.mail.Session
;
import
javax.mail.internet.MimeMessage
;
import
javax.mail.internet.MimeMessage
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -114,6 +116,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -114,6 +116,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
return
page
;
return
page
;
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
@Override
public
EmailContent
emailEditVo
(
EmailEditVo
vo
)
{
public
EmailContent
emailEditVo
(
EmailEditVo
vo
)
{
...
@@ -134,49 +137,46 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -134,49 +137,46 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
//发件人
//发件人
long
folderId
=
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
?
EmailFolderEnum
.
FOLDER_ALREADY_SEND
.
getKey
().
longValue
()
:
EmailFolderEnum
.
FOLDER_OUTBOX
.
getKey
().
longValue
();
long
folderId
=
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
())
?
EmailFolderEnum
.
FOLDER_ALREADY_SEND
.
getKey
().
longValue
()
:
EmailFolderEnum
.
FOLDER_OUTBOX
.
getKey
().
longValue
();
this
.
saveEmailSender
(
adminContext
,
content
,
folderId
,
vo
.
getIsSend
());
this
.
saveEmailSender
(
adminContext
,
content
,
folderId
,
vo
.
getIsSend
());
//vo.getIsSend() == 1就发送
if
(
vo
.
getIsSend
()!=
null
&&
vo
.
getIsSend
().
equals
(
WhetherEnum
.
YES
.
getKey
()))
{
//收件人
//收件人
List
<
CustomerUserVo
>
receiverList
=
new
ArrayList
<>();
List
<
CustomerUserVo
>
receiverList
=
new
ArrayList
<>();
if
(
CollectionUtil
.
isNotEmpty
(
vo
.
getReceiver
()))
{
if
(
CollectionUtil
.
isNotEmpty
(
vo
.
getReceiver
()))
{
for
(
Long
userId
:
vo
.
getReceiver
())
{
for
(
Long
userId
:
vo
.
getReceiver
())
{
CustomerUserVo
receiver
=
this
.
adminFeignClient
.
getUserById
(
userId
);
CustomerUserVo
receiver
=
this
.
adminFeignClient
.
getUserById
(
userId
);
AssertUtils
.
notNull
(
receiver
,
"调用admin失败,根据userId获取人员接口异常"
);
AssertUtils
.
notNull
(
receiver
,
"调用admin失败,根据userId获取人员接口异常"
);
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
());
this
.
saveEmailReceiver
(
receiverList
,
content
,
EmailFolderEnum
.
FOLDER_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
YES
.
getKey
(),
vo
.
getIsSend
());
//发送短信
//发送短信
smsUtil
.
sendBatchSms
(
receiverList
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收。"
,
content
.
getId
());
smsUtil
.
sendBatchSms
(
receiverList
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收。"
,
content
.
getId
());
//代办
//代办
msgUtil
.
sendMsg
(
content
,
receiverList
,
systemInfo
);
msgUtil
.
sendMsg
(
content
,
receiverList
,
systemInfo
);
}
}
}
}
//收件部门人员
//收件部门人员
List
<
CustomerUserVo
>
deptUserList
=
new
ArrayList
<>();
List
<
CustomerUserVo
>
deptUserList
=
new
ArrayList
<>();
if
(
CollectionUtil
.
isNotEmpty
(
vo
.
getReceiveDeptList
()))
{
if
(
CollectionUtil
.
isNotEmpty
(
vo
.
getReceiveDeptList
()))
{
for
(
Long
deptId
:
vo
.
getReceiveDeptList
())
{
for
(
Long
deptId
:
vo
.
getReceiveDeptList
())
{
ResultVo
<
List
<
CustomerUserVo
>>
userByDeptId
=
adminFeignClient
.
getUserByDeptId
(
deptId
);
ResultVo
<
List
<
CustomerUserVo
>>
userByDeptId
=
adminFeignClient
.
getUserByDeptId
(
deptId
);
AssertUtils
.
isTrue
(
userByDeptId
.
isSuccess
(),
"调用admin失败,根据deptId获取人员接口异常"
);
AssertUtils
.
isTrue
(
userByDeptId
.
isSuccess
(),
"调用admin失败,根据deptId获取人员接口异常"
);
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
(),
WhetherEnum
.
YES
.
getKey
());
this
.
saveEmailReceiver
(
deptUserList
,
content
,
EmailFolderEnum
.
FOLDER_DEPT_INBOX
.
getKey
().
longValue
(),
WhetherEnum
.
NO
.
getKey
(),
vo
.
getIsSend
());
//短信
//短信
smsUtil
.
sendBatchSms
(
deptUserList
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收。"
,
content
.
getId
());
smsUtil
.
sendBatchSms
(
deptUserList
,
"您有一封新的邮件,标题为《"
+
content
.
getTitle
()
+
"》。请及时查收。"
,
content
.
getId
());
//代办
//代办
msgUtil
.
sendMsg
(
content
,
deptUserList
,
systemInfo
);
msgUtil
.
sendMsg
(
content
,
deptUserList
,
systemInfo
);
}
}
}
}
}
}
}
return
content
;
return
content
;
}
}
...
@@ -522,15 +522,27 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -522,15 +522,27 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
vo
.
setIsSend
(
WhetherEnum
.
NO
.
getKey
());
vo
.
setIsSend
(
WhetherEnum
.
NO
.
getKey
());
break
;
break
;
case
FOLDER_ALREADY_SEND:
//已发送
case
FOLDER_ALREADY_SEND:
//已发送
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_SEND
);
if
(
vo
.
getSendUserId
()!=
null
){
vo
.
setIsPerson
(
WhetherEnum
.
YES
.
getKey
());
vo
.
setFolderId
(
null
);
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
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
;
break
;
case
FOLDER_ALREADY_DELETE:
//回收站
case
FOLDER_ALREADY_DELETE:
//回收站
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_RECEIVE
);
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_RECEIVE
);
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
break
;
break
;
default
:
//其他文件夹
default
:
//其他文件夹
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_RECEIVE
);
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
break
;
break
;
}
}
vo
.
setUserId
(
adminContext
.
getUserId
());
vo
.
setUserId
(
adminContext
.
getUserId
());
...
@@ -583,8 +595,8 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
...
@@ -583,8 +595,8 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
break
;
break
;
default
:
//其他文件夹
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
());
...
...
src/main/java/com/zq/email/vo/EmailReqVo.java
View file @
43bb2429
...
@@ -58,6 +58,7 @@ public class EmailReqVo extends PageReqVo {
...
@@ -58,6 +58,7 @@ public class EmailReqVo extends PageReqVo {
* 其他文件夹
* 其他文件夹
* folderId = 前端根据点击传入
* folderId = 前端根据点击传入
* searchRange = 0
* searchRange = 0
* isSend = 1
*/
*/
...
...
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