Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-service

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");
@@ -52,13 +56,14 @@ public class    DDMsgUtil {
     /**
      *
      * @param userIdList : 钉钉用户id列表，多个逗号分隔
+     * @param taskUserName : 待办任务用户名
      * @param title
      * @param body
      * @param taskId
      * @return
      */
 
-    public static Result<?> sendOaMessage(String userIdList, String title, String body,
+    public static Result<?> sendOaMessage(String userIdList, String taskUserName, String title, String body,
                                    String taskId){
 
         Result<?> tokenResult = getAccessToken();
@@ -71,10 +76,11 @@ public class    DDMsgUtil {
         }
 
         try {
-            LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            //LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             // 参数为用户名_taskid des加密
-            String key = URLEncoder.encode(EncryptUtil.desEncrypt(loginUser.getUsername()+"_"+taskId),"UTF-8");
+            String key = URLEncoder.encode(EncryptUtil.desEncrypt(taskUserName+"_"+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

@@ -173,7 +173,6 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
                 if(users==null||users.size()==0){
                     throw new RuntimeException("任务节点未分配任何候选审批人，发起流程失败");
                 }else{
-                    String ddUserIds = "";
                     // 分配了节点负责人分发给全部
                     for(LoginUser user : users){
                         taskService.addCandidateUser(task.getId(), user.getUsername());
@@ -184,30 +183,30 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
                         // 异步发消息 森语取消所有审批消息
 //                        sendActMessage(loginUser,user,actBusiness,task.getName(), actBusiness.getSendMessage(),
 //                                actBusiness.getSendSms(), actBusiness.getSendEmail(),map);
+                        // 发送钉钉消息
                         if (oConvertUtils.isNotEmpty(user.getDingUser())){
-                            ddUserIds+=user.getDingUser()+",";
+                            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("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(user.getDingUser(), user.getUsername(), title+"需要您审批", content, task.getId());
+                            }
                         }
                     }
 
-                    // 发送钉钉消息
-                    if (oConvertUtils.isNotEmpty(ddUserIds)){
-                        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"));
-                        }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"));
-                        }
-                        if (oConvertUtils.isNotEmpty(content)) {
-                            DDMsgUtil.sendOaMessage(ddUserIds, title, content, task.getId());
-                        }
-                    }
+
                 }
 
             }else {
@@ -233,29 +232,29 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
                 allUserList.forEach(u->{
                     if (oConvertUtils.isNotEmpty(u.getDingUser())){
                         if (assigneeUserIdList.stream().filter(e->e.equals(u.getUsername())).count()>0){
-                            ddUserIds.append(u.getDingUser()+",");
+                            // 发送钉钉消息
+                            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("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(u.getDingUser(), u.getUsername(),title+"需要您审批", content, task.getId());
+                            }
                         }
                     }
                 });
-                // 发送钉钉消息
-                if (ddUserIds.length()>0){
-                    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"));
-                    }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"));
-                    }
-                    if (oConvertUtils.isNotEmpty(content)) {
-                        DDMsgUtil.sendOaMessage(ddUserIds.toString(), title, content, task.getId());
-                    }
-                }
+
             }
             // 设置任务优先级
             taskService.setPriority(task.getId(), actBusiness.getPriority());

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

@@ -511,7 +511,6 @@ public class ActTaskController {
                         // 避免重复添加
                         List<String> list = actBusinessService.selectIRunIdentity(t.getId(), "candidate");
                         if(list==null||list.size()==0) {
-                            String ddUserIds = "";
                             // 分配了节点负责人分发给全部
                             for (LoginUser user : users) {
                                 taskService.addCandidateUser(t.getId(), user.getId());
@@ -519,30 +518,35 @@ public class ActTaskController {
                                 map.put("isUrl","1");
                                 map.put("url","/activiti/applyList");
                                 map.put("taskId",t.getId());
+
+
+                                // 发送钉钉消息
+                                if (oConvertUtils.isNotEmpty(user.getDingUser())){
+                                    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"));
+                                        title = "质量事故单";
+                                    }else if ("preparation_material_v1".equalsIgnoreCase(actBusiness.getTableName())) {
+                                        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(user.getDingUser(), user.getUsername(), title+"需要您审批", content, t.getId());
+                                    }
+                                }
                                 // 异步发消息  森语取消所有审批消息
 //                                actZprocessService.sendActMessage(loginUser,user,actBusiness,task.getName(),  sendMessage, sendSms, sendEmail,map);
                             }
                             taskService.setPriority(t.getId(), task.getPriority());
 
-                            // 发送钉钉消息
-                            if (oConvertUtils.isNotEmpty(ddUserIds)){
-                                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"));
-                                }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"));
-                                }
-                                if (oConvertUtils.isNotEmpty(content)) {
-                                    DDMsgUtil.sendOaMessage(ddUserIds, title, content, task.getId());
-                                }
-                            }
+
                         }
                     }
                 }else{
@@ -566,34 +570,34 @@ public class ActTaskController {
                         // 获取钉钉消息要发送的用户
                         List<LoginUser> allUserList = actNodeService.queryAllUser();
                         List<String> assigneeUserIdList = Arrays.asList(assignees.split(","));
-                        StringBuilder ddUserIds = new StringBuilder();
                         allUserList.forEach(u->{
                             if (oConvertUtils.isNotEmpty(u.getDingUser())){
-                                if (assigneeUserIdList.stream().filter(e->e.equals(u.getUsername())).count()>0){
-                                    ddUserIds.append(u.getDingUser()+",");
+                                if (assigneeUserIdList.stream().filter(e->e.equals(u.getUsername())).count()>0) {
+                                    // 发送钉钉消息
+                                    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"));
+                                        title = "质量事故单";
+                                    } else if ("preparation_material_v1".equalsIgnoreCase(actBusiness.getTableName())) {
+                                        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(u.getDingUser(), u.getUsername(), title + "需要您审批", content, t.getId());
+                                    }
                                 }
+
                             }
                         });
 
-                        // 发送钉钉消息
-                        if (ddUserIds.length()>0){
-                            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"));
-                            }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"));
-                            }
-                            if (oConvertUtils.isNotEmpty(content)) {
-                                DDMsgUtil.sendOaMessage(ddUserIds.toString(), title, content, task.getId());
-                            }
-                        }
+
                     }
                 }
             }

jeecg-boot/jeecg-boot-module-system/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
 	<!--定义日志文件的存储地址 -->
-	<property name="LOG_HOME" value="../logs" />
+	<property name="LOG_HOME" value="../logs-oa" />
 
 	<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />
 	<!-- 控制台输出 -->