Browse Source

【钉钉对接】【订阅推送】

wuyx 1 year ago
parent
commit
f116a9e3a2

+ 6 - 7
uas-office-dingtalk/src/main/java/com/usoftchina/uas/office/dingtalk/task/DingTalkSubsTask.java

@@ -80,9 +80,8 @@ public class DingTalkSubsTask {
                 for(Employee employee : emList){
                 for(Employee employee : emList){
                     try {
                     try {
                         String title = "您有新的订阅信息";
                         String title = "您有新的订阅信息";
-                        String description ="您有新的订阅信息,共:(%s)条。";
+                        String description ="#您有新的订阅信息";
                         String agentUrl = agent.getOuterUrl();
                         String agentUrl = agent.getOuterUrl();
-                        String process = agentUrl.substring(agentUrl.indexOf("/",10)+1,agentUrl.indexOf("/",agentUrl.indexOf("/",10)+1));
                         //获取待推送的订阅信息
                         //获取待推送的订阅信息
                         List<Map<String,Object>> remindList =uasSubsService.getSubs_instance(employee.getEm_id());
                         List<Map<String,Object>> remindList =uasSubsService.getSubs_instance(employee.getEm_id());
                         logger.info("pushSubsData-remindList.size:"+remindList.size());
                         logger.info("pushSubsData-remindList.size:"+remindList.size());
@@ -96,14 +95,14 @@ public class DingTalkSubsTask {
                                     if(i > 2){
                                     if(i > 2){
                                         break;
                                         break;
                                     }//https://erp.yitoa.com:8888/ERP/uasMobile/#/ERP/uasMobile/subscribeChart/660372/20665/85487
                                     }//https://erp.yitoa.com:8888/ERP/uasMobile/#/ERP/uasMobile/subscribeChart/660372/20665/85487
-                                    String msgUrl=UrlUtils.generateAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agentUrl.substring(0,agentUrl.indexOf("#")+2),
-                                            dataCenter.getOuterUrl() + "authorize",process+"/uasMobile/subscribeChart/"+remindRecor.get("ID_")+"/"+remindRecor.get("NUM_ID_")
-                                                    +"/"+remindRecor.get("INSTANCE_ID_") );
+                                    String msgUrl=UrlUtils.generateAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agentUrl,
+                                            dataCenter.getOuterUrl() + "authorize"
+                                            ,"/uasMobile/#/ERP/uasMobile/subscribeChart/"+remindRecor.get("ID_")+"/"+remindRecor.get("NUM_ID_")+"/"+remindRecor.get("INSTANCE_ID_") );
                                     urlList.add(new SendMessageReq.ActionUrlList(remindRecor.get("TITLE_").toString(),msgUrl));
                                     urlList.add(new SendMessageReq.ActionUrlList(remindRecor.get("TITLE_").toString(),msgUrl));
                                 }
                                 }
                                 if(remindList.size() > 3){//更多 https://erp.yitoa.com:8888/ERP/uasMobile/#/ERP/uasMobile/subscribeList
                                 if(remindList.size() > 3){//更多 https://erp.yitoa.com:8888/ERP/uasMobile/#/ERP/uasMobile/subscribeList
-                                    String moreUrl = UrlUtils.generateAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                            dataCenter.getOuterUrl() + "authorize", process+"/uasMobile/subscribeList");
+                                    String moreUrl = UrlUtils.generateAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agentUrl,
+                                            dataCenter.getOuterUrl() + "authorize", "/uasMobile/#/ERP/uasMobile/subscribeList");
                                     urlList.add(new SendMessageReq.ActionUrlList("更多...",moreUrl));
                                     urlList.add(new SendMessageReq.ActionUrlList("更多...",moreUrl));
                                 }
                                 }
                                 messageSdk.send("Uas", new SendMessageReq()
                                 messageSdk.send("Uas", new SendMessageReq()