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

消息通知跳转完善

This commit is contained in:
lizhicheng 2022-10-11 16:19:47 +08:00
parent 894c5c0251
commit 50fed6862d
2 changed files with 10 additions and 14 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

@ -190,7 +190,8 @@ public class ActivitiNoticeAspect {
CompletableFuture.runAsync(() -> { // 发起人 CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + resourceName + " " + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + " 节点" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的" + resourceName + " " + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + " 节点" + finalResult;
Integer type = 10; SysNoticeDTO dto = new SysNoticeDTO();
Integer type = 12;
if ("能力申请流程".equals(activitiNoticeOperation.process())) { if ("能力申请流程".equals(activitiNoticeOperation.process())) {
type = 0; type = 0;
} else if ("能力资源上架".equals(activitiNoticeOperation.process())) { } else if ("能力资源上架".equals(activitiNoticeOperation.process())) {
@ -202,8 +203,8 @@ public class ActivitiNoticeAspect {
} else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) {
type = 8; type = 8;
} }
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(type); dto.setType(type);
dto.setApplyId(delegateTask.getExecution().getProcessInstanceId());
dto.setTitle("流程节点系统通知"); dto.setTitle("流程节点系统通知");
dto.setContent(content); // 通知内容 dto.setContent(content); // 通知内容
dto.setReceiverType(1); dto.setReceiverType(1);
@ -214,9 +215,6 @@ public class ActivitiNoticeAspect {
dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreator(sysUserService.getByUsername("admin").getId());
dto.setCreateDate(new Date()); dto.setCreateDate(new Date());
dto.setFrom("通知"); dto.setFrom("通知");
if (tAbilityApplicationDTOList != null) {
dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag());
}
dto.setApplyState(0); dto.setApplyState(0);
sysNoticeService.save(dto); sysNoticeService.save(dto);
}, EXECUTOR); }, EXECUTOR);
@ -302,6 +300,7 @@ public class ActivitiNoticeAspect {
CompletableFuture.runAsync(() -> { // 发起人 CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + userDTO.getRealName() + ",您发起的 " + resourceName + " " + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的 " + resourceName + " " + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO();
Integer type = 10; Integer type = 10;
if ("能力申请流程".equals(activitiNoticeOperation.process())) { if ("能力申请流程".equals(activitiNoticeOperation.process())) {
type = 0; type = 0;
@ -314,8 +313,8 @@ public class ActivitiNoticeAspect {
} else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) {
type = 8; type = 8;
} }
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(type); dto.setType(type);
dto.setApplyId(execution.getProcessInstanceId());
dto.setTitle("流程结束系统通知"); dto.setTitle("流程结束系统通知");
dto.setContent(content); // 通知内容 dto.setContent(content); // 通知内容
dto.setReceiverType(1); dto.setReceiverType(1);
@ -326,9 +325,6 @@ public class ActivitiNoticeAspect {
dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreator(sysUserService.getByUsername("admin").getId());
dto.setCreateDate(new Date()); dto.setCreateDate(new Date());
dto.setFrom("通知"); dto.setFrom("通知");
if (tAbilityApplicationDTOList != null) {
dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag());
}
dto.setApplyState(0); dto.setApplyState(0);
sysNoticeService.save(dto); sysNoticeService.save(dto);
}, EXECUTOR).thenRunAsync(() -> { }, EXECUTOR).thenRunAsync(() -> {
@ -443,6 +439,7 @@ public class ActivitiNoticeAspect {
LOGGER.error("审核人：{}", assignee.getId()); LOGGER.error("审核人：{}", assignee.getId());
String content = "【通知】您发起的流程 " + resourceName + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\""; String content = "【通知】您发起的流程 " + resourceName + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\"";
LOGGER.info("通知内容：{}", content); LOGGER.info("通知内容：{}", content);
SysNoticeDTO dto = new SysNoticeDTO();
Integer type = 10; Integer type = 10;
if ("能力申请流程".equals(activitiNoticeOperation.process())) { if ("能力申请流程".equals(activitiNoticeOperation.process())) {
type = 0; type = 0;
@ -455,8 +452,8 @@ public class ActivitiNoticeAspect {
} else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) {
type = 8; type = 8;
} }
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(type); dto.setType(type);
dto.setApplyId(delegateTask.getProcessInstanceId());
dto.setTitle("流程流转系统通知"); dto.setTitle("流程流转系统通知");
dto.setContent(content); // 通知内容 dto.setContent(content); // 通知内容
dto.setReceiverType(1); dto.setReceiverType(1);
@ -467,9 +464,6 @@ public class ActivitiNoticeAspect {
dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreator(sysUserService.getByUsername("admin").getId());
dto.setCreateDate(new Date()); dto.setCreateDate(new Date());
dto.setFrom("通知"); dto.setFrom("通知");
if (tAbilityApplicationDTOList != null) {
dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag());
}
dto.setApplyState(0); dto.setApplyState(0);
sysNoticeService.save(dto); sysNoticeService.save(dto);
} catch (Exception exception) { } catch (Exception exception) {

4
renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
View File

@ -98,7 +98,9 @@ public class TDemandCommentServiceImpl extends CrudServiceImpl<TDemandCommentDao
String content = "【评论】" + (sysUserDTO.isPresent() ? sysUserDTO.get().getRealName() : "") + " 您发起的需求 " + tDemandDataDTO.orElse(new TDemandDataDTO()).getDemandSubject() String content = "【评论】" + (sysUserDTO.isPresent() ? sysUserDTO.get().getRealName() : "") + " 您发起的需求 " + tDemandDataDTO.orElse(new TDemandDataDTO()).getDemandSubject()
+ " 有新的评论"; + " 有新的评论";
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(8);
dto.setApplyState(0);
dto.setApplyId(tDemandCommentDTO.getDemandDataDTO().getInstanceId());
dto.setTitle("需求评论系统通知"); dto.setTitle("需求评论系统通知");
dto.setContent(content); // 通知内容 dto.setContent(content); // 通知内容
dto.setReceiverType(1); dto.setReceiverType(1);