shilei
/
haojing
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

#HJ-32# 提交最新的代码

Browse Source
feature-LeeD-20221025
shilei 2 years ago
parent 4e3db3732a
commit 040d5795c7
5 changed files with 161 additions and 109 deletions
Show Stats Download Patch File Download Diff File

16
src/com/customization/dito/sendtodo/SendPortalErrorUtil.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.customization.dito.sendtodo;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.formmode.setup.ModeRightInfo;
import weaver.general.BaseBean;
@ -25,6 +26,9 @@ public class SendPortalErrorUtil {
ModeRightInfo modeRightInfo = new ModeRightInfo();
modeRightInfo.setNewRight(true);
if(StringUtils.isNotEmpty(requestobject)){
requestobject = requestobject.replace("\"","\\\"");
}
String formmodeid = "" ;
String sql =" select k.id from modeinfo k \n" +
" inner join workflow_bill l on formid = l.id\n" +
@ -92,4 +96,16 @@ public class SendPortalErrorUtil {
}
}
}
public void doCreateSendPortalTodoErrorInfo(){
BaseBean bb = new BaseBean();
bb.writeLog("doCreateSendPortalTodoErrorInfo");
}
public void doCreateSendPortalDoneErrorInfo(){
BaseBean bb = new BaseBean();
bb.writeLog("doCreateSendPortalDoneErrorInfo");
}
}

49
src/com/customization/dito/sendtodo/SendPortalToReadUtil.java
Unescape Escape View File

@ -30,6 +30,7 @@ public class SendPortalToReadUtil {
HttpRequestUtil httpRequestUtil = new HttpRequestUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
SendPortalErrorUtil sendPortalErrorUtil = new SendPortalErrorUtil();
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
@ -54,6 +55,7 @@ public class SendPortalToReadUtil {
JSONArray taskObjectList = new JSONArray();
// int u_userid = user.getUID();
String lastname = "";
String loginid = "" ;
// String workcode = "";
// String sql = " select * from (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) w where w.id = '" + u_userid + "'";
@ -86,7 +88,7 @@ public class SendPortalToReadUtil {
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t1.requestid = "+requestid ;
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname "+
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -100,6 +102,7 @@ public class SendPortalToReadUtil {
workflowname = Util.null2String(rs.getString("workflowname")) ;
requestname = Util.null2String(rs.getString("requestname")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
requestObject.put("center",center);
requestObject.put("title",requestname);
@ -113,7 +116,7 @@ public class SendPortalToReadUtil {
requestObject.put("urlDing",urlDing);
requestObject.put("ticketType",workflowname);
requestObject.put("urlApp",urlApp);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
sql = " select t2.userid,h1.loginid,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+
" from workflow_requestbase t1\n" +
@ -196,12 +199,7 @@ public class SendPortalToReadUtil {
if(matcher.matches()){
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
}
}else{
}
}
}
}
bb.writeLog("emailArray:"+emailArray);
if(StringUtils.isNotEmpty(emailArray))
@ -213,6 +211,16 @@ public class SendPortalToReadUtil {
//sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,resultmsg);
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
@ -230,6 +238,8 @@ public class SendPortalToReadUtil {
public void sendToReadDataByNode(String requestid,String noideid,User user,String portal_todourl,String bpm_app_workflowurl,String username,String passwd,String bpm_workflowurl,String center,String bpm_app_requesturl){
HttpRequestUtil httpRequestUtil = new HttpRequestUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
SendPortalErrorUtil sendPortalErrorUtil = new SendPortalErrorUtil();
Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT);
String mobileJumpUrl = PropBean.getUfPropValue("mobileJumpUrl");
@ -302,6 +312,7 @@ public class SendPortalToReadUtil {
String workflowname = "" ;
String requestname = "";
String loginid = "";
JSONArray taskObjectList = new JSONArray();
// sql =" select t1.workflowid,t1.requestname,t1.requestmark,t3.workflowname\n" +
@ -310,7 +321,7 @@ public class SendPortalToReadUtil {
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t1.requestid = " + requestid;
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname "+
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -324,6 +335,7 @@ public class SendPortalToReadUtil {
workflowname = Util.null2String(rs.getString("workflowname"));
requestname = Util.null2String(rs.getString("requestname"));
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
requestObject.put("center", center);
@ -338,7 +350,7 @@ public class SendPortalToReadUtil {
requestObject.put("urlPc", urlPc);
requestObject.put("urlDing", urlDing);
requestObject.put("ticketType", workflowname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("urlApp",urlApp);
sql = " select t2.userid,h1.loginid,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+
@ -421,10 +433,6 @@ public class SendPortalToReadUtil {
if (matcher.matches()) {
emailArray += StringUtils.isEmpty(emailArray) ? email : "," + email;
}
}
}
}
}
bb.writeLog("emailArray:" + emailArray);
if (StringUtils.isNotEmpty(emailArray)) {
@ -434,6 +442,21 @@ public class SendPortalToReadUtil {
String notificationContent = templateMap.get("notificationContent");
//sendMailUtil.sendMail(requestid, emailArray, notificationSubject, notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,resultmsg);
}
}
}
}
}
} catch (Exception e) {
e.printStackTrace();

103
src/com/customization/dito/sendtodo/SendPortalTodoUtil.java
Unescape Escape View File

@ -61,9 +61,23 @@ public class SendPortalTodoUtil {
String nodeId = "";
String nodeName = "" ;
String userids = "" ;
String loginid = "" ;
String workflowname = "";
int userid = user.getUID();
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String replace = bpm_app_workflowurl.replace("/bpm", "");
String urlDing = replace+bpm_app_requesturl+requestid;
String urlApp = replace+bpm_app_requesturl+requestid;
if(StringUtils.isNotEmpty(mobileJumpUrl)){
urlDing += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8");
urlApp += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8");
}
String sql =" select t1.requestname,h1.loginid,d1.nodename,h1.email,c1."+cus_staff+" as staffid,t3.workflowname,h2.lastname,t2.userid "+
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
@ -83,35 +97,25 @@ public class SendPortalTodoUtil {
bb.writeLog("sendTodoDataByCreater-sql:"+sql);
rs.executeQuery(sql);
if (rs.next()){
String workflowname = Util.null2String(rs.getString("workflowname")) ;
workflowname = Util.null2String(rs.getString("workflowname")) ;
requestname = Util.null2String(rs.getString("requestname")) ;
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
String loginid = Util.null2String(rs.getString("loginid")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
userids = Util.null2String(rs.getString("userid")) ;
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String replace = bpm_app_workflowurl.replace("/bpm", "");
String urlDing = replace+bpm_app_requesturl+requestid;
String urlApp = replace+bpm_app_requesturl+requestid;
if(StringUtils.isNotEmpty(mobileJumpUrl)){
urlDing += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8");
urlApp += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8");
String email = Util.null2String(rs.getString("email")) ;
bb.writeLog("email1:"+email);
Matcher matcher = regex.matcher(email);
if(matcher.matches()){
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
}
}
// String urlDing = replace+bpm_app_requesturl+requestid;
// String urlApp = replace+bpm_app_requesturl+requestid;
bb.writeLog("urlDing", urlDing);
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
@ -143,17 +147,8 @@ public class SendPortalTodoUtil {
taskObject.put("objectId",staffid);
taskObject.put("operatorCode",operatorCode);
taskObjectList.add(taskObject);
requestObject.put("taskObjectList",taskObjectList);
String email = Util.null2String(rs.getString("email")) ;
bb.writeLog("email1:"+email);
Matcher matcher = regex.matcher(email);
if(matcher.matches()){
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
}
}
//bb.writeLog("dataJsonnew:"+requestObject.toJSONString());
// String username = "admin";
// String passwd = "Uportal_123";
@ -179,6 +174,8 @@ public class SendPortalTodoUtil {
sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,resultmsg);
@ -241,8 +238,9 @@ public class SendPortalTodoUtil {
String nodeId = "" ;
String nodeName = "";
String workflowname = "" ;
String loginid = "" ;
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname"+
String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -258,6 +256,7 @@ public class SendPortalTodoUtil {
nodeName = Util.null2String(rs.getString("nodeName")) ;
workflowname = Util.null2String(rs.getString("workflowname")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
@ -279,7 +278,7 @@ public class SendPortalTodoUtil {
JSONObject requestObject = new JSONObject();
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
@ -310,17 +309,17 @@ public class SendPortalTodoUtil {
rs.executeQuery(sql);
while (rs.next()){
String loginid = Util.null2String(rs.getString("loginid")) ;
String userocde = Util.null2String(rs.getString("loginid")) ;
String staffid = Util.null2String(rs.getString("staffid")) ;
String userid = Util.null2String(rs.getString("userid")) ;
userids += StringUtils.isEmpty(userids) ? userid : ","+userid ;
if("sysadmin".equals(loginid)){
loginid = "Admin";
if("sysadmin".equals(userocde)){
userocde = "Admin";
}
String objectCode = loginid ;
String operatorCode = loginid ;
String objectCode = userocde ;
String operatorCode = userocde ;
JSONObject taskObject = new JSONObject();
taskObject.put("objectAction",objectAction);
@ -360,9 +359,11 @@ public class SendPortalTodoUtil {
String notificationSubject = templateMap.get("notificationSubject");
String notificationContent = templateMap.get("notificationContent");
sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,resultmsg);
@ -408,6 +409,7 @@ public class SendPortalTodoUtil {
String nodeId = "" ;
String nodeName = "" ;
String userids = "" ;
String loginid = "" ;
// String workcode = "";
// String sql = " select * from (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) w where w.id = '" + userid + "'";
@ -453,7 +455,7 @@ public class SendPortalTodoUtil {
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t1.requestid = "+requestid ;
String sql = " select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname "+
String sql = " select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -470,6 +472,7 @@ public class SendPortalTodoUtil {
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
@ -490,7 +493,7 @@ public class SendPortalTodoUtil {
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
@ -505,13 +508,13 @@ public class SendPortalTodoUtil {
requestObject.put("nodeName",nodeName);
requestObject.put("ticketType",workflowname);
String loginid = user.getLoginid() ;
if("sysadmin".equals(loginid)){
loginid = "Admin";
String usercode = user.getLoginid() ;
if("sysadmin".equals(usercode)){
usercode = "Admin";
}
String objectCode = loginid ;
String operatorCode = loginid ;
String objectCode = usercode ;
String operatorCode = usercode ;
JSONObject taskObject = new JSONObject();
taskObject.put("objectAction",objectAction);
taskObject.put("objectType",objectType);
@ -540,7 +543,7 @@ public class SendPortalTodoUtil {
// " and t1.requestid = "+requestid ;
String sql = " select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname "+
String sql = " select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -557,6 +560,7 @@ public class SendPortalTodoUtil {
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
@ -573,7 +577,7 @@ public class SendPortalTodoUtil {
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
@ -657,6 +661,8 @@ public class SendPortalTodoUtil {
sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,resultmsg);
@ -717,6 +723,7 @@ public class SendPortalTodoUtil {
String nodeId = "";
String nodeName = "" ;
String userids = "" ;
String loginid = "";
// sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname\n" +
// " from workflow_requestbase t1\n" +
@ -742,6 +749,7 @@ public class SendPortalTodoUtil {
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
@ -763,7 +771,7 @@ public class SendPortalTodoUtil {
JSONObject requestObject = new JSONObject();
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
@ -847,9 +855,12 @@ public class SendPortalTodoUtil {
sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent);
}
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,"");
}else{
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,resultmsg);
}
}
}

8
src/com/customization/dito/sendtodo/SendPortalWithRawRunnable.java
Unescape Escape View File

@ -161,7 +161,7 @@ public class SendPortalWithRawRunnable implements Runnable{
String userid = dataObject.getString("userid");
JSONObject requestObject = new JSONObject();
requestObject.put("center", lastname);
requestObject.put("center", center);
requestObject.put("title", requestname);
requestObject.put("taskType", taskType);
requestObject.put("actionType", actionType);
@ -260,6 +260,7 @@ public class SendPortalWithRawRunnable implements Runnable{
String nodeId = "" ;
String nodeName = "" ;
String lastname = "" ;
String loginid = "" ;
// sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname\n" +
// " from workflow_requestbase t1\n" +
// " inner join workflow_base t3 on t1.workflowid = t3.id\n" +
@ -267,7 +268,7 @@ public class SendPortalWithRawRunnable implements Runnable{
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t1.requestid = "+requestid ;
sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname "+
sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+
" 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 "+
@ -284,6 +285,7 @@ public class SendPortalWithRawRunnable implements Runnable{
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
lastname = Util.null2String(rs.getString("lastname")) ;
loginid = Util.null2String(rs.getString("loginid")) ;
}
@ -349,7 +351,7 @@ public class SendPortalWithRawRunnable implements Runnable{
requestObject.put("center",center);
requestObject.put("title",requestname);
requestObject.put("creator",lastname);
requestObject.put("creator",loginid);
requestObject.put("taskCode",requestid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);

2
src/weaver/interfaces/dito/portal/SendRequestData2PortalInterfaces.java
Unescape Escape View File

@ -137,7 +137,7 @@ public class SendRequestData2PortalInterfaces implements SendRequestStatusDataIn
jsonArray.add(donejson);
}
ArrayList<RequestStatusObj> deldatas = dobj.getDeldatas();
if(deldatas.size()>0){//处理推送的删除数据
if(deldatas.size()>0){ //处理推送的删除数据
JSONArray todolist = new JSONArray();
for(RequestStatusObj rso : deldatas){//遍历当前发送的删除数据
requestname = rso.getRequstname() ;

Write Preview
Loading…
Cancel
Save