尝试修复微信消息发送失败

flow-im/flow-im-entity/src/main/java/com/flow/job/SendUskyJob.java

@@ -79,35 +79,26 @@ public class SendUskyJob {
         JSONObject sendJson = new JSONObject();
 
         for (Notify send : unSend) {
-            String subject = send.getSubject();
+            String subject = send.getSubject().split("-")[0];
+            String processName = send.getSubject().split("-")[1];
             String approvalResult = "";
-            Object approvalNode = send.getParams().get("approvalNode");
+
+            log.info("审批单：{}", processName);
+            log.info("审批节点：{}", send.getContent());
+
             switch (subject) {
                 case "申请已通过":
                     approvalResult = "审批通过";
-                    if (approvalNode != null) {
-                        sendJson.put("approvalNode", approvalNode);
-                    }
                     break;
                 case "新的审批任务":
-                    approvalResult = "审批中";
-                    if (approvalNode != null) {
-                        sendJson.put("approvalNode", approvalNode);
-                    }
-                    break;
                 case "催办":
                     approvalResult = "审批中";
-                    sendJson.put("approvalNode", extractContentInBrackets(send.getContent()));
                     break;
                 case "申请拒绝":
                     approvalResult = "审批驳回";
-                    if (approvalNode != null) {
-                        sendJson.put("approvalNode", approvalNode);
-                    }
                     break;
                 case "审批提醒":
                     approvalResult = "审批超时";
-                    sendJson.put("approvalNode", extractContentInBrackets(send.getContent()));
                     break;
             }
 
@@ -129,7 +120,8 @@ public class SendUskyJob {
             sendJson.put("userNames", Collections.singletonList(send.getReceiver()));
             sendJson.put("id", send.getId());
             sendJson.put("approvalResult", approvalResult);
-            sendJson.put("processName", send.getContent());
+            sendJson.put("processName", processName);
+            sendJson.put("approvalNode", send.getContent());
             sendJson.put("realName", userNamesMap.get(send.getSender()));
 
             String sendJsonString = sendJson.toString();

flow-workflow/flow-workflow-biz/src/main/java/com/flow/listener/GlobalActivityEventListener.java

@@ -135,14 +135,15 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
                 Notify notify = new Notify();
                 Map<String, Object> params = new HashMap<>();
 
-                notify.setSubject("新的审批任务");
-                //notify.setContent(String.format("您有一条待处理的审批任务【%s】，请及时处理。", entity.getName()));
-                String instanceId = entity.getProcessInstanceId();
 
+                // notify.setContent(String.format("您有一条待处理的审批任务【%s】，请及时处理。", entity.getName()));
+                String instanceId = entity.getProcessInstanceId();
                 FormInfo form = flowInstanceService.getForm(instanceId);
                 String fromName = form.getFlowDefine().getName();
+                notify.setSubject("新的审批任务" + "-" + fromName);
 
-                notify.setContent(fromName);
+                // 审批节点
+                notify.setContent(entity.getName());
                 notify.setSender(SecurityContextUtil.getUserId());
                 notify.setType(NotifyEnum.TODO);
                 notify.setReceiver(entity.getAssignee());
@@ -200,12 +201,14 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
                 Notify notify = new Notify();
                 notify.setSubject("申请已通过");
 
-                //notify.setContent(String.format("您申请的流程《%s》已通过", entity.getName()));
+                // notify.setContent(String.format("您申请的流程《%s》已通过", entity.getName()));
                 String instanceId = entity.getProcessInstanceId();
                 FormInfo form = flowInstanceService.getForm(instanceId);
                 String fromName = form.getFlowDefine().getName();
 
-                notify.setContent(fromName);
+                notify.setSubject("申请已通过" + "-" + fromName);
+
+                notify.setContent(entity.getName());
                 notify.setSender(entity.getStartUserId());
                 notify.setType(NotifyEnum.SYSTEM);
                 notify.setReceiver(entity.getStartUserId());

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowInstanceServiceImpl.java

@@ -206,10 +206,12 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
         notify.setSubject("申请拒绝");
 
         // notify.setContent(String.format("您申请的流程《%s》已拒绝", processInstance.getName()));
+        notify.setContent(processInstance.getName());
+
         FormInfo form = flowInstanceService.getForm(instanceId);
         String fromName = form.getFlowDefine().getName();
+        notify.setSubject("申请拒绝" + "-" + fromName);
 
-        notify.setContent(String.format(fromName));
         notify.setSender(SecurityContextUtil.getNickName());
         notify.setType(NotifyEnum.SYSTEM);
         notify.setReceiver(processInstance.getStartUserId());