update 推送统一待办

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 date = DateUtil.formatDateTime(new Date());
-        String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getUsername() + 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)){

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<ProcessApprovalRecord> getByTaskId(String taskId) {
+        ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getByTaskId(taskId);
+        return Result.OK(processApprovalRecord);
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java

@@ -43,6 +43,12 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         return this.getOne(wrapper);
     }
 
+    public ProcessApprovalRecord getByTaskId(String taskId){
+        LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProcessApprovalRecord::getTaskId,taskId);
+        return this.getOne(wrapper);
+    }
+
     public Page<ProcessApprovalRecord> pageList(Page<ProcessApprovalRecord> page, ProcessApprovalRecord processApprovalRecord, HttpServletRequest req) {
         QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){

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:

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}