Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
practical_train
Commits
2c6a3954
Commit
2c6a3954
authored
Sep 08, 2026
by
王蔡翾
Browse files
短信消息接入其他模块
parent
ff1bfb1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
practical-business/src/main/java/com/platform/business/service/impl/LeaveManagementServiceImpl.java
View file @
2c6a3954
...
...
@@ -251,7 +251,8 @@ public class LeaveManagementServiceImpl implements LeaveManagementService {
}
/**
* 审批结果始终反馈给申请学员;批准时额外同步全部管理员,拒绝时不扩大接收范围。
* 审批结果始终反馈给申请学员;批准时另发一条只含审批意见的管理员消息,
* 防止管理员收到面向学员的“您的请假申请”话术。拒绝时不通知管理员。
*/
void
publishLeaveReview
(
LeaveApplicationVO
leave
,
String
reviewStatus
,
String
approverId
,
String
approverRole
)
{
...
...
@@ -259,25 +260,39 @@ public class LeaveManagementServiceImpl implements LeaveManagementService {
String
resultName
=
approved
?
"已通过"
:
"未通过"
;
String
opinion
=
isBlank
(
leave
.
getApprovalOpinion
())
?
"审批人未填写意见"
:
leave
.
getApprovalOpinion
();
NotificationPublishDTO
message
=
new
NotificationPublishDTO
();
message
.
setEventId
(
"leave-review:"
+
leave
.
getId
());
message
.
setMessageType
(
"LEAVE"
);
message
.
setTitle
(
"请假审批"
+
resultName
);
message
.
setSummary
(
"您的请假申请"
+
resultName
);
message
.
setContent
(
"您的请假申请"
+
resultName
+
"。审批意见:"
+
opinion
);
message
.
setBusinessType
(
"LEAVE"
);
message
.
setBusinessId
(
leave
.
getId
());
message
.
setActionUrl
(
"/leave/student/"
+
leave
.
getId
());
message
.
setPriority
(
approved
?
"NORMAL"
:
"IMPORTANT"
);
message
.
setRecipientUserIds
(
Collections
.
singletonList
(
leave
.
getStudentId
()));
if
(
approved
)
{
message
.
setRecipientRoleNames
(
Collections
.
singletonList
(
AccountAdminConstants
.
ROLE_ADMIN
));
}
String
senderName
=
isBlank
(
leave
.
getApproverName
())
?
(
LeaveConstants
.
ROLE_TEACHER
.
equals
(
approverRole
)
?
AccountAdminConstants
.
ROLE_TEACHER
:
AccountAdminConstants
.
ROLE_ADMIN
)
:
leave
.
getApproverName
();
notificationPublisher
.
publish
(
message
,
approverId
,
senderName
);
NotificationPublishDTO
studentMessage
=
new
NotificationPublishDTO
();
studentMessage
.
setEventId
(
"leave-review:"
+
leave
.
getId
()
+
":student"
);
studentMessage
.
setMessageType
(
"LEAVE"
);
studentMessage
.
setTitle
(
"请假审批"
+
resultName
);
studentMessage
.
setSummary
(
"您的请假申请"
+
resultName
);
studentMessage
.
setContent
(
"您的请假申请"
+
resultName
+
"。审批意见:"
+
opinion
);
studentMessage
.
setBusinessType
(
"LEAVE"
);
studentMessage
.
setBusinessId
(
leave
.
getId
());
studentMessage
.
setActionUrl
(
"/leave/student/"
+
leave
.
getId
());
studentMessage
.
setPriority
(
approved
?
"NORMAL"
:
"IMPORTANT"
);
studentMessage
.
setRecipientUserIds
(
Collections
.
singletonList
(
leave
.
getStudentId
()));
notificationPublisher
.
publish
(
studentMessage
,
approverId
,
senderName
);
if
(
approved
)
{
NotificationPublishDTO
adminMessage
=
new
NotificationPublishDTO
();
adminMessage
.
setEventId
(
"leave-review:"
+
leave
.
getId
()
+
":admin"
);
adminMessage
.
setMessageType
(
"LEAVE"
);
adminMessage
.
setTitle
(
"请假审批意见"
);
adminMessage
.
setSummary
(
opinion
);
adminMessage
.
setContent
(
opinion
);
adminMessage
.
setBusinessType
(
"LEAVE"
);
adminMessage
.
setBusinessId
(
leave
.
getId
());
adminMessage
.
setActionUrl
(
"/leave/admin/"
+
leave
.
getId
());
adminMessage
.
setPriority
(
"NORMAL"
);
adminMessage
.
setRecipientRoleNames
(
Collections
.
singletonList
(
AccountAdminConstants
.
ROLE_ADMIN
));
notificationPublisher
.
publish
(
adminMessage
,
approverId
,
senderName
);
}
}
@Override
...
...
practical-business/src/test/java/com/platform/business/service/impl/LeaveManagementNotificationTest.java
View file @
2c6a3954
...
...
@@ -50,7 +50,7 @@ class LeaveManagementNotificationTest {
}
@Test
void
reviewShould
NotifyStudentAndAddAdmins
OnlyWhenApproved
()
{
void
reviewShould
SendSeparateAdminOpinion
OnlyWhenApproved
()
{
LeaveApplicationVO
leave
=
leave
();
leave
.
setApproverName
(
"王老师"
);
leave
.
setApprovalOpinion
(
"审批意见"
);
...
...
@@ -62,15 +62,22 @@ class LeaveManagementNotificationTest {
ArgumentCaptor
<
NotificationPublishDTO
>
messageCaptor
=
ArgumentCaptor
.
forClass
(
NotificationPublishDTO
.
class
);
verify
(
notificationPublisher
,
times
(
2
)).
publish
(
verify
(
notificationPublisher
,
times
(
3
)).
publish
(
messageCaptor
.
capture
(),
eq
(
"teacher-1"
),
eq
(
"王老师"
));
NotificationPublishDTO
approvedStudent
=
messageCaptor
.
getAllValues
().
get
(
0
);
NotificationPublishDTO
approvedAdmin
=
messageCaptor
.
getAllValues
().
get
(
1
);
NotificationPublishDTO
rejectedStudent
=
messageCaptor
.
getAllValues
().
get
(
2
);
assertEquals
(
Collections
.
singletonList
(
"student-1"
),
messageCaptor
.
getAllValues
().
get
(
0
).
getRecipientUserIds
());
approvedStudent
.
getRecipientUserIds
());
assertNull
(
approvedStudent
.
getRecipientRoleNames
());
assertEquals
(
Collections
.
singletonList
(
"管理员"
),
messageCaptor
.
getAllValues
().
get
(
0
).
getRecipientRoleNames
());
assertEquals
(
Collections
.
singletonList
(
"student-1"
),
messageCaptor
.
getAllValues
().
get
(
1
).
getRecipientUserIds
());
assertNull
(
messageCaptor
.
getAllValues
().
get
(
1
).
getRecipientRoleNames
());
approvedAdmin
.
getRecipientRoleNames
());
assertNull
(
approvedAdmin
.
getRecipientUserIds
());
assertEquals
(
"审批意见"
,
approvedAdmin
.
getSummary
());
assertEquals
(
"审批意见"
,
approvedAdmin
.
getContent
());
assertEquals
(
Collections
.
singletonList
(
"student-1"
),
rejectedStudent
.
getRecipientUserIds
());
assertNull
(
rejectedStudent
.
getRecipientRoleNames
());
}
private
LeaveApplicationVO
leave
()
{
...
...
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