Merge branch 'master' of ssh://10.10.100.21/source/uas-office-integration

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/listener/UasProcessListener.java

@@ -110,29 +110,28 @@ public class UasProcessListener {
         }
     }
     private void sendProcessMessage(UasEvent event, Integer nodeId,String msg) {
-
-        JProcandOrProcess process = Try.call(() -> jProcessService.getJProcandOrProcessById(nodeId), 10);
-        if (null == process) {
-            logger.warn("can not find process {}, {}", nodeId, event);
-            return;
-        }
-        String[] emList = jProcessService.getDealManById(nodeId);
-        if (null == emList) {
-            return;
-        }
-        DataCenter dataCenter = DataCenter.INSTANCE;
-        String title = process.getJp_launchername() + "的" + process.getJp_name()+msg;
-        String description = "单据编号:" + process.getJp_codevalue()+"请您尽快";
         try {
-            // 根据UAS配置的外部地址发送 开通U审批用U审批推送 没开通用UAS应用推送
-            QywxAgent agent = getUasAgent();
-            String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
-            String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
-                    dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
-            messageSdk.send((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit", new SendMessageReq()
-                    .textCard(title, description, msgUrl, "查看详情")
-                    .toUser(emList));
-        } catch (Exception e) {
+            JProcandOrProcess process = jProcessService.getJProcandOrProcessById(nodeId);
+            if (null == process) {
+                logger.warn("send urge message can not find process {}, {}", nodeId, event);
+                return;
+            }
+            String[] emList = jProcessService.getDealManById(nodeId);
+            if (null == emList) {
+                return;
+            }
+            DataCenter dataCenter = DataCenter.INSTANCE;
+            String title = process.getJp_launchername() + "的" + process.getJp_name()+msg;
+            String description = "单据编号:" + process.getJp_codevalue()+"请您尽快处理";
+                // 根据UAS配置的外部地址发送 开通U审批用U审批推送 没开通用UAS应用推送
+                QywxAgent agent = getUasAgent();
+                String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
+                String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
+                        dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                messageSdk.send((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit", new SendMessageReq()
+                        .textCard(title, description, msgUrl, "查看详情")
+                        .toUser(emList));
+        }catch (Exception e){
             logger.error("send urge message error", e);
         }
     }

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxProcessTask.java

@@ -45,7 +45,7 @@ public class QywxProcessTask {
     /**
      * 每日审批提醒推送
      */
-    @Scheduled(cron="0 0 23 * * ?  ")
+    @Scheduled(cron="0 0 8 * * ?  ")
     public void pullCheckinData() {
         if (!messageSdk.isAgentEnabled("Uas")) {
             return;
@@ -61,7 +61,7 @@ public class QywxProcessTask {
                         QywxAgent agent = agentService.findByCode("Uas");
                         //获取待提醒流程列表
                         List<Map<String,Object>> remindList = uasJProcessService.getRemindList(em.getEm_code());
-                        if(remindList.size() > 0 && "周袁#李剑辉#吴雨骁#李嘉#饶猛".contains(em.getEm_name())){
+                        if(remindList.size() > 0){
                             StringBuffer content = new StringBuffer();
                             content.append("**您有<font color=blue>"+remindList.get(0).get("COUNTS")+"</font>个审批单还未处理**\n" );
                             for (Map<String,Object> remind: remindList) {
@@ -71,9 +71,11 @@ public class QywxProcessTask {
                                 content.append("> 【停留").append(remind.get("PASSTIME")).append("天】\n ")
                                         .append(remind.get("JP_LAUNCHERNAME")).append("的[").append(remind.get("JP_NAME")).append("]("+msgUrl+")\n");
                             }
-                            String moreUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                    dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
-                            content.append("[更多...](").append(moreUrl).append(")");
+                            if(remindList.size()>5){
+                                String moreUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
+                                        dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
+                                content.append("[更多...](").append(moreUrl).append(")");
+                            }
                             messageSdk.send("UasAudit", new SendMessageReq().markdown(content.toString()).toUser(em.getEm_qywx()));
                         }
                     } catch (Exception e) {