Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
6efedc40
Commit
6efedc40
authored
Nov 03, 2021
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)增加审核结果展示
parent
ae201c65
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
ExecuteTypeEnum.java
...ejoin/amos/latentdanger/common/enums/ExecuteTypeEnum.java
+9
-0
LatentDangerServiceImpl.java
...danger/business/service/impl/LatentDangerServiceImpl.java
+1
-1
AsyncTask.java
...a/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java
+3
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/ExecuteTypeEnum.java
View file @
6efedc40
...
...
@@ -66,4 +66,13 @@ public enum ExecuteTypeEnum {
}
return
null
;
}
public
static
String
getNameByCode
(
Integer
code
)
{
for
(
ExecuteTypeEnum
e
:
ExecuteTypeEnum
.
values
())
{
if
(
code
.
equals
(
e
.
getCode
()))
{
return
e
.
getName
();
}
}
return
null
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @
6efedc40
...
...
@@ -2080,7 +2080,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
throw
new
Exception
(
executeSubmitDto
.
getMsg
());
}
List
<
String
>
userIds
=
workflowExecuteService
.
getUserIdsByWorkflow
(
latentDanger
.
getInstanceId
(),
executeSubmitDto
.
getCheckLeaderId
());
asyncTask
.
sendDangerSubmitMsg
(
RequestContext
.
cloneRequestContext
(),
latentDanger
,
userIds
);
asyncTask
.
sendDangerSubmitMsg
(
RequestContext
.
cloneRequestContext
(),
latentDanger
,
userIds
,
ExecuteTypeEnum
.
getNameByCode
(
executeType
)
);
return
executeSubmitDto
;
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java
View file @
6efedc40
...
...
@@ -184,13 +184,13 @@ public class AsyncTask {
* 确认隐患发送消息
*/
@Async
public
void
sendDangerSubmitMsg
(
RequestContextModel
requestContextModel
,
LatentDanger
latentDanger
,
List
<
String
>
userIds
){
public
void
sendDangerSubmitMsg
(
RequestContextModel
requestContextModel
,
LatentDanger
latentDanger
,
List
<
String
>
userIds
,
String
executeName
){
RequestContext
.
setToken
(
requestContextModel
.
getToken
());
RequestContext
.
setProduct
(
requestContextModel
.
getProduct
());
RequestContext
.
setAppKey
(
requestContextModel
.
getAppKey
());
MessageModel
model
=
new
MessageModel
();
String
body
=
String
.
format
(
"隐患名称:%s;隐患级别:%s;治理方式:%s;当前状态:%s;推送时间:%s"
,
latentDanger
.
getDangerName
(),
latentDanger
.
getDangerLevelName
(),
latentDanger
.
getReformTypeName
(),
latentDanger
.
getDangerStateName
(),
DateUtil
.
date2LongStr
(
new
Date
()));
String
body
=
String
.
format
(
"隐患名称:%s;隐患级别:%s;治理方式:%s;当前状态:%s;
审核结果:%s;
推送时间:%s"
,
latentDanger
.
getDangerName
(),
latentDanger
.
getDangerLevelName
(),
latentDanger
.
getReformTypeName
(),
latentDanger
.
getDangerStateName
(),
executeName
,
DateUtil
.
date2LongStr
(
new
Date
()));
model
.
setBody
(
body
);
model
.
setIsSendWeb
(
true
);
model
.
setRecivers
(
userIds
);
...
...
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