钉钉消息更新

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DDMsgUtil.java

@@ -11,6 +11,8 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.security.EncryptUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
@@ -41,6 +43,8 @@ public class    DDMsgUtil {
     @Autowired
     private Environment env;
 
+    private static final Logger logger = LoggerFactory.getLogger(DDMsgUtil.class);
+
     @PostConstruct
     public void readConfig() {
         appKey = env.getProperty("dingtalk.appKey");
@@ -75,6 +79,7 @@ public class    DDMsgUtil {
             // 参数为用户名_taskid des加密
             String key = URLEncoder.encode(EncryptUtil.desEncrypt(loginUser.getUsername()+"_"+taskId),"UTF-8");
             String url = frontBaseUrl+"/activiti/check/"+ key;
+            logger.error("请求地址："+url);
 
             DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2");
             OapiMessageCorpconversationAsyncsendV2Request req = new OapiMessageCorpconversationAsyncsendV2Request();

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActZprocessServiceImpl.java

@@ -191,21 +191,23 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
 
                     // 发送钉钉消息
                     if (oConvertUtils.isNotEmpty(ddUserIds)){
-                        String title = actBusiness.getTitle()+"需要您审批";
+                        String title = "";//actBusiness.getTitle()+"需要您审批";
                         String content = "";
                         // 质量事故单
                         if ("incident_ticket".equalsIgnoreCase(tableName)){
                             content= oConvertUtils.getString(params.get("informant"))+
                                     "，"+oConvertUtils.getString(params.get("department_main"))+
                                     "，"+oConvertUtils.getString(params.get("accident_theme"));
+                            title = "质量事故单";
                         }else if ("preparation_material_v1".equalsIgnoreCase(tableName)) {
-                            content = oConvertUtils.getString(params.get("informant")) +
+                            content = oConvertUtils.getString(params.get("ccode")) +
                                     "，"+oConvertUtils.getString(params.get("cvenabbname")) +
                                     "，"+oConvertUtils.getString(params.get("main_create_by")) +
                                     "，"+oConvertUtils.getString(params.get("imquantity"));
+                            title = "备坯申请";
                         }
                         if (oConvertUtils.isNotEmpty(content)) {
-                            DDMsgUtil.sendOaMessage(ddUserIds, title, content, task.getId());
+                            DDMsgUtil.sendOaMessage(ddUserIds, title+"需要您审批", content, task.getId());
                         }
                     }
                 }
@@ -239,21 +241,23 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
                 });
                 // 发送钉钉消息
                 if (ddUserIds.length()>0){
-                    String title = actBusiness.getTitle()+"需要您审批";
+                    String title ="";// actBusiness.getTitle()+;
                     String content = "";
                     // 质量事故单
                     if ("incident_ticket".equalsIgnoreCase(tableName)){
-                        content= "填报人："+oConvertUtils.getString(params.get("informant"))+
-                                "；责任部门："+oConvertUtils.getString(params.get("department_main"))+
-                                "；主题："+oConvertUtils.getString(params.get("accident_theme"));
+                        content= oConvertUtils.getString(params.get("informant"))+
+                                "，"+oConvertUtils.getString(params.get("department_main"))+
+                                "，"+oConvertUtils.getString(params.get("accident_theme"));
+                        title = "质量事故单";
                     }else if ("preparation_material_v1".equalsIgnoreCase(tableName)) {
-                        content = "计划单号："+oConvertUtils.getString(params.get("informant")) +
-                                "；供应商："+oConvertUtils.getString(params.get("cvenabbname")) +
-                                "；申请人："+oConvertUtils.getString(params.get("main_create_by")) +
-                                "；申请数量："+oConvertUtils.getString(params.get("imquantity"));
+                        content = oConvertUtils.getString(params.get("ccode")) +
+                                "，"+oConvertUtils.getString(params.get("cvenabbname")) +
+                                "，"+oConvertUtils.getString(params.get("main_create_by")) +
+                                "，"+oConvertUtils.getString(params.get("imquantity"));
+                        title = "备坯申请";
                     }
                     if (oConvertUtils.isNotEmpty(content)) {
-                        DDMsgUtil.sendOaMessage(ddUserIds.toString(), title, content, task.getId());
+                        DDMsgUtil.sendOaMessage(ddUserIds.toString(), title+"需要您审批", content, task.getId());
                     }
                 }
             }

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java

@@ -526,21 +526,23 @@ public class ActTaskController {
 
                             // 发送钉钉消息
                             if (oConvertUtils.isNotEmpty(ddUserIds)){
-                                String title = actBusiness.getTitle()+"需要您审批";
+                                String title = "";//actBusiness.getTitle()+"需要您审批";
                                 String content = "";
                                 // 质量事故单
                                 if ("incident_ticket".equalsIgnoreCase(actBusiness.getTableName())){
-                                    content= "填报人："+oConvertUtils.getString(busiData.get("informant"))+
-                                            "；责任部门："+oConvertUtils.getString(busiData.get("department_main"))+
-                                            "；主题："+oConvertUtils.getString(busiData.get("accident_theme"));
+                                    content= oConvertUtils.getString(busiData.get("informant"))+
+                                            "，"+oConvertUtils.getString(busiData.get("department_main"))+
+                                            "，"+oConvertUtils.getString(busiData.get("accident_theme"));
+                                    title = "质量事故单";
                                 }else if ("preparation_material_v1".equalsIgnoreCase(actBusiness.getTableName())) {
-                                    content = "计划单号："+oConvertUtils.getString(busiData.get("informant")) +
-                                            "；供应商："+oConvertUtils.getString(busiData.get("cvenabbname")) +
-                                            "；申请人："+oConvertUtils.getString(busiData.get("main_create_by")) +
-                                            "；申请数量："+oConvertUtils.getString(busiData.get("imquantity"));
+                                    content = oConvertUtils.getString(busiData.get("ccode")) +
+                                            "，"+oConvertUtils.getString(busiData.get("cvenabbname")) +
+                                            "，"+oConvertUtils.getString(busiData.get("main_create_by")) +
+                                            "，"+oConvertUtils.getString(busiData.get("imquantity"));
+                                    title = "备坯申请";
                                 }
                                 if (oConvertUtils.isNotEmpty(content)) {
-                                    DDMsgUtil.sendOaMessage(ddUserIds, title, content, task.getId());
+                                    DDMsgUtil.sendOaMessage(ddUserIds, title+"需要您审批", content, task.getId());
                                 }
                             }
                         }
@@ -577,21 +579,23 @@ public class ActTaskController {
 
                         // 发送钉钉消息
                         if (ddUserIds.length()>0){
-                            String title = actBusiness.getTitle()+"需要您审批";
+                            String title = "";//actBusiness.getTitle()+"需要您审批";
                             String content = "";
                             // 质量事故单
                             if ("incident_ticket".equalsIgnoreCase(actBusiness.getTableName())){
-                                content= "填报人："+oConvertUtils.getString(busiData.get("informant"))+
-                                        "；责任部门："+oConvertUtils.getString(busiData.get("department_main"))+
-                                        "；主题："+oConvertUtils.getString(busiData.get("accident_theme"));
+                                content= oConvertUtils.getString(busiData.get("informant"))+
+                                        "，"+oConvertUtils.getString(busiData.get("department_main"))+
+                                        "，"+oConvertUtils.getString(busiData.get("accident_theme"));
+                                title = "质量事故单";
                             }else if ("preparation_material_v1".equalsIgnoreCase(actBusiness.getTableName())) {
-                                content = "计划单号："+oConvertUtils.getString(busiData.get("informant")) +
-                                        "；供应商："+oConvertUtils.getString(busiData.get("cvenabbname")) +
-                                        "；申请人："+oConvertUtils.getString(busiData.get("main_create_by")) +
-                                        "；申请数量："+oConvertUtils.getString(busiData.get("imquantity"));
+                                content = oConvertUtils.getString(busiData.get("ccode")) +
+                                        "，"+oConvertUtils.getString(busiData.get("cvenabbname")) +
+                                        "，"+oConvertUtils.getString(busiData.get("main_create_by")) +
+                                        "，"+oConvertUtils.getString(busiData.get("imquantity"));
+                                title = "备坯申请";
                             }
                             if (oConvertUtils.isNotEmpty(content)) {
-                                DDMsgUtil.sendOaMessage(ddUserIds.toString(), title, content, task.getId());
+                                DDMsgUtil.sendOaMessage(ddUserIds.toString(), title+"需要您审批", content, task.getId());
                             }
                         }
                     }