wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-20 10:36:30 +08:00
parent e90976b781 ffa1ebc9f7
commit c8589edb41
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
View File

@ -135,6 +135,10 @@ public class ActivitiNoticeAspect {
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final StringBuilder resourceName = new StringBuilder();
if (kv.containsKey("resourceDTO")) {
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
}
final String workKey = TaskListener.EVENTNAME_COMPLETE + key;
if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------");
@ -174,7 +178,7 @@ public class ActivitiNoticeAspect {
String finalResult = result;
CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + resourceName + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
dto.setTitle("流程节点系统通知");
@ -220,6 +224,10 @@ public class ActivitiNoticeAspect {
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final StringBuilder resourceName = new StringBuilder();
if (kv.containsKey("resourceDTO")) {
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
}
final String workKey = ExecutionListener.EVENTNAME_END + key;
if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------");
@ -259,7 +267,7 @@ public class ActivitiNoticeAspect {
String finalResult = result;
CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
String content = "【通知】" + userDTO.getRealName() + ",您发起的"+resourceName + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
dto.setTitle("流程结束系统通知");
@ -334,6 +342,10 @@ public class ActivitiNoticeAspect {
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final StringBuilder resourceName = new StringBuilder();
if (kv.containsKey("resourceDTO")) {
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
}
final String workKey = TaskListener.EVENTNAME_ASSIGNMENT + key;
if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------");
@ -357,7 +369,7 @@ public class ActivitiNoticeAspect {
try {
SysUserDTO assignee = sysUserService.get(Long.valueOf(delegateTask.getAssignee()));
LOGGER.error("审核人：{}", assignee.getId());
String content = "【通知】您发起的流程 " + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\"";
String content = "【通知】您发起的流程 " +resourceName+ activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\"";
LOGGER.info("通知内容：{}", content);
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
@ -378,7 +390,7 @@ public class ActivitiNoticeAspect {
}, EXECUTOR).thenRunAsync(() -> { // 审批者
try {
SysUserDTO owner = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + owner.getRealName() + "发起的流程" + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
String content = "【通知】" + owner.getRealName() + "发起的流程"+resourceName + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
dto.setTitle("流程流转系统通知");