update 推送统一待办
This commit is contained in:
+25
-6
@@ -1,5 +1,7 @@
|
||||
package com.jero.modules.docking.hiwork.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
@@ -66,11 +68,15 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
||||
private boolean isWorkflow;
|
||||
@Value("${hiwork.sysCode}")
|
||||
private String hiworkSysCode;
|
||||
@Value("${hiwork.url}")
|
||||
private String hiworkUrl;
|
||||
@Value("${hiwork.fontUrl}")
|
||||
private String hiworkFontUrl;
|
||||
@Value("${hiwork.fontAppUrl}")
|
||||
private String hiworkFontAppUrl;
|
||||
|
||||
|
||||
private static final String PROCESS_TYPE = "标准法规SRMS";
|
||||
private static final String PROCESS_TYPE = "srms";
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
@@ -120,8 +126,8 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
||||
HiworkTodo hiworkTodo = new HiworkTodo();
|
||||
hiworkTodo.setSysCode(hiworkSysCode);
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
String date = new SimpleDateFormat("yyyy年MM月dd日").format(new Date());
|
||||
String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getUsername() + date + ")";
|
||||
String date = DateUtil.formatDateTime(new Date());
|
||||
String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")";
|
||||
hiworkTodo.setNoticeTitle(noticeTitle);
|
||||
hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId());
|
||||
hiworkTodo.setProcessName(processApprovalRecord.getTaskName());
|
||||
@@ -156,15 +162,28 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
|
||||
hiworkTodo.setDueTime(processAll.getDueTime().getTime());
|
||||
}
|
||||
hiworkTodo.setBid(processAll.getProjectId());
|
||||
String url = hiworkFontUrl.replace("{projectId}",processAll.getProjectId())
|
||||
String url = hiworkFontUrl
|
||||
.replaceAll("&","%26")
|
||||
.replaceAll("\\?","%3F")
|
||||
.replace("{projectId}",processAll.getProjectId())
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||
// 跳转链接
|
||||
hiworkTodo.setBusinessLink(url.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType()))));
|
||||
String businessLink = hiworkUrl + url.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
|
||||
hiworkTodo.setBusinessLink(businessLink);
|
||||
// APP跳转链接
|
||||
hiworkTodo.setAppBusinessLink(url.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType()))));
|
||||
String appUrl = hiworkFontAppUrl
|
||||
.replaceAll("&","%26")
|
||||
.replaceAll("\\?","%3F")
|
||||
.replace("{projectId}",processAll.getProjectId())
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}",processApprovalRecord.getTaskId())
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||
String appBusinessLink = hiworkUrl + appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
|
||||
hiworkTodo.setAppBusinessLink(appBusinessLink);
|
||||
}
|
||||
SysUser sysUser = sysUserService.getById(processApprovalRecord.getUserId());
|
||||
if(!Objects.isNull(sysUser)){
|
||||
|
||||
Reference in New Issue
Block a user