diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java index 159887f9..23bbb732 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java @@ -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)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index ea4ec8b3..b078a1cc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -231,4 +231,14 @@ public class WorkCenterController { return Result.OK(); } + /** + * 根据taskId查询 + */ + @ApiOperation(value="根据taskId查询") + @PostMapping("/getByTaskId") + public Result getByTaskId(String taskId) { + ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getByTaskId(taskId); + return Result.OK(processApprovalRecord); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index 6fc1b3a8..5c0924b0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -43,6 +43,12 @@ public class ProcessApprovalRecordService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); + return this.getOne(wrapper); + } + public Page pageList(Page page, ProcessApprovalRecord processApprovalRecord, HttpServletRequest req) { QueryWrapper wrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){ diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 782c766c..0c002fd6 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -408,7 +408,9 @@ hiwork: # 是否推送统一待办 isWorkflow: false # 前端调用地址 - fontUrl: http://localhost:3334/{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + url: https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= + fontUrl: http://localhost:3334{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontAppUrl: http://localhost:3334/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} # 汽车标准数字化平台ASMS asms: diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index ec21c05d..982ce4e2 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -383,6 +383,7 @@ hiwork: # 是否推送统一待办 isWorkflow: true # 前端调用地址 + url: https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= fontUrl: http://srms-test.sinotruk.com{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} fontAppUrl: http://srms-test.sinotruk.com/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}