#EC-HJ-7# 人力资源mq消息增加日志

feature-LeeD-20221025
shilei 3 years ago
parent 3c7f2fe0c3
commit 6ecd0e040d

@ -59,8 +59,6 @@ public class SendPortalTodoRunnable implements Runnable{
*/
public void sendTodoDataByCreater(String requestId, User user, String portal_todourl, String username, String passwd, String bpm_workflowurl, String center){
//HttpReqUtils httpReqUtils = new HttpReqUtils();
SendPortalTodoUtil sendPortalTodoUtil = new SendPortalTodoUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
BaseBean bb = new BaseBean();
@ -68,12 +66,16 @@ public class SendPortalTodoRunnable implements Runnable{
JSONArray emailArray = new JSONArray();
String requestname = "";
String requestremark = "" ;
String actionType = "0" ;
String terminal = "1" ;
String taskType = "0";
String objectAction = "0" ;
String objectType = "0";
String objectId = "" ;
String ticketType = center ;
Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT);
@ -132,10 +134,9 @@ public class SendPortalTodoRunnable implements Runnable{
JSONArray taskObjectList = new JSONArray();
JSONObject taskObject = new JSONObject();
String objectAction = "0" ;
String objectType = "0";
String objectCode = creator ;
String objectId = "" ;
String operatorCode = creator ;
taskObject.put("objectAction",objectAction);
@ -147,7 +148,6 @@ public class SendPortalTodoRunnable implements Runnable{
requestObject.put("taskObjectList",taskObjectList);
String email = Util.null2String(rs.getString("email")) ;
Matcher matcher = regex.matcher(email);
if(matcher.matches()){
@ -193,43 +193,36 @@ public class SendPortalTodoRunnable implements Runnable{
*/
public void sendTodoDataByCreateNode(String requestid,String noideid,User user,String portal_todourl,String username,String passwd,String bpm_workflowurl,String center){
//HttpReqUtils httpReqUtils = new HttpReqUtils();
SendPortalTodoUtil sendPortalTodoUtil = new SendPortalTodoUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
RecordSet rs = new RecordSet();
JSONObject requestObject = new JSONObject();
JSONArray emailArray = new JSONArray();
Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT);
BaseBean bb = new BaseBean();
bb.writeLog("sendTodoDataByCreateNode");
RecordSet rs = new RecordSet();
String ticketType = center ;
String terminal = "1" ;
try {
String currentnodetype = "" ;
String sql = " select currentnodetype from workflow_requestbase where requestid="+requestid;
rs.executeQuery(sql);
bb.writeLog("sendTodoDataByNode--sql:"+sql);
if (rs.next()){
currentnodetype = Util.null2String(rs.getString("CURRENTNODETYPE"));
}
bb.writeLog("sendTodoDataByNode--currentnodetype:"+currentnodetype);
if("3".equals(currentnodetype)){
String actionType = "3" ;
}else{
String actionType = "0" ;
String taskType = "0";
String objectAction = "0" ;
String objectType = "0";
String objectId = "" ;
try {
JSONArray taskObjectList = new JSONArray();
sql = " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
" t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename,h1.email\n" +
String sql =" select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
" t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_base t3 on t1.workflowid = t3.id\n" +
" left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+
" left join (select id, lastname,loginid,email from hrmresource where status = 1 union all select id, lastname,loginid,'' as email from hrmresourcemanager ) h1 on h1.id = t1.creater\n" +
" left join (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t1.creater\n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.requestid = "+requestid ;
bb.writeLog("sendTodoDataByNode--sql:"+sql);
rs.executeQuery(sql);
if (rs.next()){
@ -244,7 +237,7 @@ public class SendPortalTodoRunnable implements Runnable{
String messageTitle = Util.null2String(rs.getString("requestname")) ;
String messageContent = Util.null2String(rs.getString("requestname")) ;
String taskType = "0";
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String urlApp = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
@ -267,32 +260,27 @@ public class SendPortalTodoRunnable implements Runnable{
requestObject.put("urlDing",urlDing);
requestObject.put("nodeName",nodeName);
requestObject.put("ticketType",ticketType);
String email = Util.null2String(rs.getString("email")) ;
emailArray.add(email);
}
sql = " select t2.userid,h1.loginid\n" +
sql = " select t2.userid,h1.loginid,h1.email\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join (select id, lastname,loginid from hrmresource where STATUS = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
" left join (select id, lastname,loginid,email from hrmresource where STATUS = 1 union all select id,lastname,loginid,'' as email from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1', '5', '8', '9', '7', '11'))\n" +
" and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid;
bb.writeLog("sendTodoDataByNode--sql:"+sql);
rs.executeQuery(sql);
while (rs.next()){
String usercode = Util.null2String(rs.getString("loginid")) ;
JSONObject taskObject = new JSONObject();
String objectAction = "0" ;
String objectType = "0";
String objectCode = usercode ;
String objectId = "" ;
String operatorCode = usercode ;
taskObject.put("objectAction",objectAction);
taskObject.put("objectType",objectType);
taskObject.put("objectCode",objectCode);
@ -301,8 +289,11 @@ public class SendPortalTodoRunnable implements Runnable{
taskObjectList.add(taskObject);
String email = Util.null2String(rs.getString("email")) ;
Matcher matcher = regex.matcher(email);
if(matcher.matches()){
emailArray.add(email);
}
}
requestObject.put("taskObjectList",taskObjectList);
@ -327,7 +318,6 @@ public class SendPortalTodoRunnable implements Runnable{
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
@ -341,32 +331,24 @@ public class SendPortalTodoRunnable implements Runnable{
* @param user
*/
public void sendTodoDataByNode(String requestid,String noideid,User user,String portal_todourl,String username,String passwd,String bpm_workflowurl,String center){
HttpReqUtils httpReqUtils = new HttpReqUtils();
SendPortalTodoUtil sendPortalTodoUtil = new SendPortalTodoUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
JSONObject requestObject = new JSONObject();
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
bb.writeLog("sendTodoDataByNode");
RecordSet rs = new RecordSet();
String ticketType = center ;
String terminal = "1" ;
try {
String currentnodetype = "" ;
String sql = " select currentnodetype from workflow_requestbase where requestid="+requestid;
rs.executeQuery(sql);
bb.writeLog("sendTodoDataByNode--sql:"+sql);
if (rs.next()){
currentnodetype = Util.null2String(rs.getString("CURRENTNODETYPE"));
}
bb.writeLog("sendTodoDataByNode--currentnodetype:"+currentnodetype);
if("3".equals(currentnodetype)){
String actionType = "3" ;
}else{
String taskType = "0";
JSONArray emailArray = new JSONArray();
Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT);
try {
String actionType = "" ;
int count = 0 ;
sql = " select t2.userid,h1.loginid\n" +
String sql =" select t2.userid,h1.loginid\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join (select id, lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
@ -412,7 +394,7 @@ public class SendPortalTodoRunnable implements Runnable{
String messageTitle = Util.null2String(rs.getString("requestname")) ;
String messageContent = Util.null2String(rs.getString("requestname")) ;
String taskType = "0";
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String urlApp = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
@ -480,8 +462,6 @@ public class SendPortalTodoRunnable implements Runnable{
String messageTitle = Util.null2String(rs.getString("requestname")) ;
String messageContent = Util.null2String(rs.getString("requestname")) ;
String taskType = "0";
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String urlApp = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
String urlDing = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
@ -505,35 +485,10 @@ public class SendPortalTodoRunnable implements Runnable{
requestObject.put("ticketType",ticketType);
}
// sql = " select t2.userid,h1.loginid\n" +
// " from workflow_requestbase t1\n" +
// " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
// " left join (select id, lastname,loginid from hrmresource where STATUS = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t2.REQUESTID = "+requestid+
// " and t2.nodeid = " + noideid ;
// bb.writeLog("sendTodoDataByNode--sql:"+sql);
// rs.executeQuery(sql);
// while (rs.next()){
// JSONObject taskObject = new JSONObject();
// String objectAction = "1" ;
// String objectType = "0";
// String objectCode = user.getLoginid() ;
// String objectId = "" ;
// String operatorCode = user.getLoginid() ;
//
// taskObject.put("objectAction",objectAction);
// taskObject.put("objectType",objectType);
// taskObject.put("objectCode",objectCode);
// taskObject.put("objectId",objectId);
// taskObject.put("operatorCode",operatorCode);
// taskObjectList.add(taskObject);
// }
sql = " select t2.userid,h1.loginid\n" +
sql = " select t2.userid,h1.loginid,h1.email\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join (select id, lastname,loginid from hrmresource where STATUS = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
" left join (select id, lastname,loginid,email from hrmresource where STATUS = 1 union all select id,lastname,loginid,'' as email from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1', '5', '8', '9', '7', '11'))\n" +
" and t2.islasttimes = 1\n" +
@ -557,6 +512,12 @@ public class SendPortalTodoRunnable implements Runnable{
taskObject.put("objectId",objectId);
taskObject.put("operatorCode",operatorCode);
taskObjectList.add(taskObject);
String email = Util.null2String(rs.getString("email")) ;
Matcher matcher = regex.matcher(email);
if(matcher.matches()){
emailArray.add(email);
}
}
requestObject.put("taskObjectList",taskObjectList);
}
@ -564,16 +525,27 @@ public class SendPortalTodoRunnable implements Runnable{
// String username = "admin";
// String passwd = "Uportal_123";
// String todourl = "http://172.16.25.133/portal-web/centerTodo/sync" ;
//"Basic YWRtaW46VXBvcnRhbF8xMjM="
String auth = username + ":" + passwd;
bb.writeLog("requestObject:"+requestObject.toJSONString());
String msgdata = httpReqUtils.doPostByAuth2(portal_todourl,requestObject.toJSONString(),auth);
String msgdata = sendPortalTodoUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
bb.writeLog("msgdata:"+msgdata);
if(!"".equals(msgdata)){
JSONObject msgObject = JSONObject.parseObject(msgdata);
System.out.println(msgObject);
//{"resultCode":"1","resultMsg":"No Result"}
if(msgObject.containsKey("resultCode")){
String resultCode = msgObject.getString("resultCode");
if("0".equals(resultCode)){
System.out.println(emailArray.toJSONString());
String notificationSubject = "";
String notificationContent = "" ;
sendMailUtil.sendMail(requestid,emailArray.toJSONString(),notificationSubject,notificationContent);
}else{
sendPortalTodoUtil.doCreateSendPortalTodoErrorInfo();
}
}
}
} catch (Exception e) {
@ -590,33 +562,26 @@ public class SendPortalTodoRunnable implements Runnable{
*/
public void sendTodoDataByReject(String requestid,String noideid,User user,String portal_todourl,String username,String passwd,String bpm_workflowurl,String center){
HttpReqUtils httpReqUtils = new HttpReqUtils();
SendPortalTodoUtil sendPortalTodoUtil = new SendPortalTodoUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
JSONObject requestObject = new JSONObject();
JSONArray emailArray = new JSONArray();
BaseBean bb = new BaseBean();
bb.writeLog("sendTodoDataByReject");
RecordSet rs = new RecordSet();
String ticketType = center ;
String terminal = "1" ;
String taskType = "0";
String objectAction = "0" ;
String objectType = "0";
String objectId = "" ;
try {
String currentnodetype = "" ;
String sql = " select currentnodetype from workflow_requestbase where requestid="+requestid;
rs.executeQuery(sql);
bb.writeLog("sendTodoDataByReject--sql:"+sql);
if (rs.next()){
currentnodetype = Util.null2String(rs.getString("CURRENTNODETYPE"));
}
bb.writeLog("sendTodoDataByReject--currentnodetype:"+currentnodetype);
if("3".equals(currentnodetype)){
String actionType = "3" ;
}else{
String actionType = "2" ;
JSONArray taskObjectList = new JSONArray();
sql = " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
String sql =" select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
" t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_base t3 on t1.workflowid = t3.id\n" +
@ -638,8 +603,6 @@ public class SendPortalTodoRunnable implements Runnable{
String messageTitle = Util.null2String(rs.getString("requestname")) ;
String messageContent = Util.null2String(rs.getString("requestname")) ;
String taskType = "0";
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String urlApp = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
String urlDing = "[newtab]"+bpm_workflowurl+"/spa/workflow/static4mobileform/index.html#/req?requestid="+requestid;
@ -663,9 +626,6 @@ public class SendPortalTodoRunnable implements Runnable{
requestObject.put("ticketType",ticketType);
}
sql = " select t2.userid,h1.loginid\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
@ -681,10 +641,9 @@ public class SendPortalTodoRunnable implements Runnable{
String usercode = Util.null2String(rs.getString("loginid")) ;
JSONObject taskObject = new JSONObject();
String objectAction = "0" ;
String objectType = "0";
String objectCode = usercode ;
String objectId = "" ;
String operatorCode = usercode ;
taskObject.put("objectAction",objectAction);
@ -697,18 +656,25 @@ public class SendPortalTodoRunnable implements Runnable{
requestObject.put("taskObjectList",taskObjectList);
// String username = "admin";
// String passwd = "Uportal_123";
// String todourl = "http://172.16.25.133/portal-web/centerTodo/sync" ;
String auth = username + ":" + passwd;
bb.writeLog("requestObject:"+requestObject.toJSONString());
String msgdata = httpReqUtils.doPostByAuth2(portal_todourl,requestObject.toJSONString(),auth);
String msgdata = sendPortalTodoUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
bb.writeLog("msgdata:"+msgdata);
if(!"".equals(msgdata)){
JSONObject msgObject = JSONObject.parseObject(msgdata);
System.out.println(msgdata);
//{"resultCode":"1","resultMsg":"No Result"}
if(msgObject.containsKey("resultCode")){
String resultCode = msgObject.getString("resultCode");
if("0".equals(resultCode)){
System.out.println(emailArray.toJSONString());
String notificationSubject = "";
String notificationContent = "" ;
sendMailUtil.sendMail(requestid,emailArray.toJSONString(),notificationSubject,notificationContent);
}else{
sendPortalTodoUtil.doCreateSendPortalTodoErrorInfo();
}
}
}
} catch (Exception e) {

Loading…
Cancel
Save