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

Merge branch 'main' into feature-LeeD-20221025

Browse Source 
# Conflicts:
#	src/com/api/signature/GetDocSignatureWebAction.java
feature-LeeD-20221025
李栋 2 years ago
parent f3f37a1b7c 661b34f4c8
commit 7f3acb3ad9
11 changed files with 379 additions and 169 deletions
Show Stats Download Patch File Download Diff File

20
interface/mobilejump/createDoneWorkflow.jsp
Unescape Escape View File

@ -27,10 +27,18 @@
String requestid = request.getParameter("requestId");
String nodeid = request.getParameter("nodeid");
String userId = request.getParameter("userId");
String portal_doneurl = PropBean.getUfPropValue("portal_doneurl");
if (userId.indexOf(",") >0){
for (String id : userId.split(",")){
sendPortalDoneData(requestid,nodeid,id,portal_doneurl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,bpm_app_requesturl);
}
}else {
sendPortalDoneData(requestid,nodeid,userId,portal_doneurl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,bpm_app_requesturl);
}
%>
<%!
@ -77,16 +85,20 @@
String requestname = "";
String workflowname = "";
String nodeName = "" ;
String creater = "";
sql = " select t1.requestname,t3.workflowname\n" +
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 "+
" left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.requestid = "+requestid ;
rs.execute(sql);
if (rs.next()) {
requestname = Util.null2String(rs.getString("requestname"));
workflowname = Util.null2String(rs.getString("workflowname"));
creater=Util.null2String(rs.getString("loginid")) ;
}
sql = " select nodename from workflow_nodebase wn where wn.id = "+nodeid ;
@ -101,7 +113,7 @@
requestObject.put("nodeId", nodeid+userid);
requestObject.put("ticketType", workflowname);
requestObject.put("title", requestname);
requestObject.put("creator", workcode);
requestObject.put("creator", creater);
requestObject.put("processStaff", workcode);
requestObject.put("processTime", processTime);
requestObject.put("isRecall", isRecall);

7
src/com/api/signature/GetDocSignatureWebAction.java
Unescape Escape View File

@ -1,7 +0,0 @@
package com.api.signature;
import javax.ws.rs.Path;
@Path("/docSign")
public class GetDocSignatureWebAction extends com.engine.signature.GetDocSignatureWebAction {
}

9
src/com/api/signature/GetDocSignatureWebActionApi.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.api.signature;
import com.engine.signature.GetDocSignatureWebAction;
import javax.ws.rs.Path;
@Path("/docSign")
public class GetDocSignatureWebActionApi extends GetDocSignatureWebAction {
}

4
src/com/customization/dito/sendtodo/SendPortalTodoCmd.java
Unescape Escape View File

@ -86,8 +86,8 @@ public class SendPortalTodoCmd extends AbstractCommandProxy<Map<String,Object>>
}
SendPortalTodoRunnable sendPortalTodoRunnable = new SendPortalTodoRunnable(src,new_requestid,requestid,nodeid,user);
new Thread(sendPortalTodoRunnable).start();
// SendPortalTodoRunnable sendPortalTodoRunnable = new SendPortalTodoRunnable(src,new_requestid,requestid,nodeid,user);
// new Thread(sendPortalTodoRunnable).start();
}
return result;

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

@ -660,7 +660,11 @@ public class SendPortalTodoUtil {
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
}
}
if (taskObjectList.size() >0){
requestObject.put("taskObjectList",taskObjectList);
}else {
requestObject.put("actionType","3");
}
//if (taskObjectList.size() > 0){
String auth = username + ":" + passwd;
//bb.writeLog("requestObject:"+requestObject.toJSONString());

52
src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java
Unescape Escape View File

@ -114,6 +114,55 @@ public class SendPortalWithAddDoneCmd {
if(rs.next()){
num = rs.getInt("num");
}
//判断是否为转发节点
sql = "SELECT c1."+PropBean.getUfPropValue("cus_staff")+" as staffid FROM workflow_currentoperator t1 left join cus_fielddata c1 on c1.id = t1.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' WHERE t1.preisremark=1 and t1.REQUESTID=? and t1.USERID=?";
rs.executeQuery(sql,requestid,doneMap.get("id"));
if (rs.next()){
//删除转发的待办
JSONObject jsonObject = new JSONObject();
jsonObject.put("center",center);
jsonObject.put("title",doneMap.get("requestname"));
jsonObject.put("creator",doneMap.get("creater"));
jsonObject.put("taskCode","weaver"+requestid);
jsonObject.put("taskType","0");
jsonObject.put("actionType","1");
jsonObject.put("createDate",processTime);
jsonObject.put("messageTitle",getShortMessageTitle(doneMap.get("requestname").toString()));
jsonObject.put("messageContent",doneMap.get("requestname"));
jsonObject.put("terminal","1");
jsonObject.put("urlPc",urlPc);
jsonObject.put("urlApp",urlApp);
jsonObject.put("urlDing",urlDing);
jsonObject.put("nodeName",doneMap.get("nodename"));
jsonObject.put("ticketType",doneMap.get("workflowname"));
JSONArray list = new JSONArray();
JSONObject taskObject = new JSONObject();
list.add(taskObject);
taskObject.put("objectAction","1");
taskObject.put("objectType","0");
taskObject.put("objectCode",doneMap.get("loginid"));
taskObject.put("objectId",rs.getString("staffid"));
taskObject.put("operatorCode",doneMap.get("loginid"));
jsonObject.put("taskObjectList",list);
bb.writeLog("SendPortalWithAddDoneCmd--delete forward workflow--requestObject:" + jsonObject.toJSONString());
String auth = username + ":" + passwd;
String msgdata = httpRequestUtil.doPostByAuth(Constants.portal_todourl, jsonObject.toJSONString(), auth);
bb.writeLog("SendPortalToReadUtil-msgdata:" + msgdata);
if(StringUtils.isNotEmpty(msgdata)) {
JSONObject msgObject = JSONObject.parseObject(msgdata);
if(msgObject.containsKey("resultCode")){
String resultCode = msgObject.getString("resultCode");
if(!"0".equals(resultCode)){
String resultmsg = msgObject.getString("resultMsg");
sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,doneMap.get("id").toString(),doneMap.get("nodename").toString(),doneMap.get("id").toString(),jsonObject.toJSONString(),resultCode,resultmsg);
}
}
}
}
if (num == 0){
bb.writeLog("num :"+num+",userid"+doneMap.get("id"));
@ -121,6 +170,7 @@ public class SendPortalWithAddDoneCmd {
String workflowname = Util.null2String(doneMap.get("workflowname"));
String requestname = Util.null2String(doneMap.get("requestname"));
String loginid = Util.null2String(doneMap.get("loginid"));
String creater = Util.null2String(doneMap.get("creater"));
String nodeName = Util.null2String(doneMap.get("nodename"));
JSONObject requestObject = new JSONObject();
requestObject.put("center", center);
@ -128,7 +178,7 @@ public class SendPortalWithAddDoneCmd {
requestObject.put("nodeId", nodeid);
requestObject.put("ticketType", workflowname);
requestObject.put("title", requestname);
requestObject.put("creator", loginid);
requestObject.put("creator", creater);
requestObject.put("processStaff", loginid);
requestObject.put("processTime", processTime);
requestObject.put("isRecall", isRecall);

66
src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java
Unescape Escape View File

@ -77,11 +77,16 @@ public class SendPortalWithAddTodoCmd {
String terminal = "1" ;
String taskType = "0";
String actionType = "2" ;
String actionType = "1" ;
String objectAction = "0" ;
String objectType = "0";
try {
bb.writeLog("SendPortalWithAddTodoCmd sleep start");
Thread.sleep(1000);
bb.writeLog("sleep end ");
String sql = "";
String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss");
@ -103,7 +108,7 @@ public class SendPortalWithAddTodoCmd {
String nodeId = "" ;
String nodeName = "" ;
String lastName = "";
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 "+
@ -119,7 +124,7 @@ public class SendPortalWithAddTodoCmd {
workflowname = Util.null2String(rs.getString("workflowname")) ;
nodeId = Util.null2String(rs.getString("nodeid")) ;
nodeName = Util.null2String(rs.getString("nodeName")) ;
lastName = Util.null2String(rs.getString("lastname")) ;
lastName = Util.null2String(rs.getString("loginid")) ;
}
requestObject.put("center",center);
@ -150,28 +155,28 @@ public class SendPortalWithAddTodoCmd {
for (Map<String,Object> todoMap: todolist){
JSONObject taskObject = new JSONObject();
sql = " select count(0) num "+
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+
" 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" +
" left join workflow_nodebase d1 on d1.id = t2.nodeid "+
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.currentnodetype <> 3"+
" and t2.isremark in ('2','9','8')\n" +
" and t2.preisremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid + " and t2.userid = "+todoMap.get("id");
rs.executeQuery(sql);
int num = 0;
if(rs.next()){
num = rs.getInt("num");
}
if (num > 0){
continue;
}
bb.writeLog("num :"+num+",userid:"+todoMap.get("id"));
// sql = " select count(0) num "+
// " from workflow_requestbase t1\n" +
// " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
// " left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+
// " 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" +
// " left join workflow_nodebase d1 on d1.id = t2.nodeid "+
// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
// " and t1.currentnodetype <> 3"+
// " and t2.isremark in ('2','9','8')\n" +
// " and t2.preisremark in ('8','9')\n" +
// " and t2.islasttimes = 1\n" +
// " and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
// " and t2.requestid = "+requestid + " and t2.userid = "+todoMap.get("id");
// rs.executeQuery(sql);
// int num = 0;
// if(rs.next()){
// num = rs.getInt("num");
// }
// if (num > 0){
// continue;
// }
// bb.writeLog("num :"+num+",userid:"+todoMap.get("id"));
sql = " select t2.userid,h1.loginid,h1.lastname,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+
" from workflow_requestbase t1\n" +
@ -180,8 +185,10 @@ public class SendPortalWithAddTodoCmd {
" 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" +
" left join workflow_nodebase d1 on d1.id = t2.nodeid "+
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.currentnodetype = 3"+
" and ((t2.isremark = '8' and t2.preisremark='8') or (t2.isremark = '9' and t2.preisremark='9'))\n" +
// " and t1.currentnodetype = 3"+
// " and ((t2.isremark = '8' and t2.preisremark='8') or (t2.isremark = '9' and t2.preisremark='9'))\n" +
" and t2.isremark in ('2','9','8')\n" +
" and t2.preisremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid+ " and t2.userid = "+todoMap.get("id");
@ -305,6 +312,11 @@ public class SendPortalWithAddTodoCmd {
String resultCode = msgObject.getString("resultCode");
if("0".equals(resultCode)){
map.put("resultCode","0");
}else if ("TODO-FAIL-001".equals(resultCode)){
// requestObject.put("actionType","2");
// bb.writeLog("after TODO-FAIL-001 sendTodoDataByNode---requestObject:"+requestObject.toJSONString());
// String msg= httpRequestUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
// bb.writeLog("after TODO-FAIL-001"+msg);
}else{
bb.writeLog(msgObject.get("resultMsg"));
map.put("resultCode",resultCode);

25
src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java
Unescape Escape View File

@ -341,6 +341,9 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
RecordSet rs = new RecordSet();
String ticketType = center ;
String terminal = "1" ;
String scopeid = "-1";
String scope = "HrmCustomFieldByInfoType" ;
String cus_staff = PropBean.getUfPropValue("cus_staff") ;
try {
String currentnodetype = "" ;
@ -356,10 +359,10 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
}else{
String actionType = "1" ;
// String actionType = "0" ;
JSONArray taskObjectList = new JSONArray();
sql = " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
sql = " select t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,h1.id,\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" +
@ -373,13 +376,13 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
String title = Util.null2String(rs.getString("requestname")) ;
String creator = Util.null2String(rs.getString("loginid")) ;
String userId = Util.null2String(rs.getString("id")) ;
String taskCode = Util.null2String(rs.getString("taskcode")) ;
String nodeId = Util.null2String(rs.getString("nodeid")) ;
String createdate = Util.null2String(rs.getString("createdate")) ;
String createtime = Util.null2String(rs.getString("createtime")) ;
String messageTitle = Util.null2String(rs.getString("requestname")) ;
// messageTitle = getShortMessageTitle(messageTitle);
String messageTitle = getShortMessageTitle(rs.getString("requestname")) ;
String messageContent = Util.null2String(rs.getString("requestname")) ;
String taskType = "0";
@ -400,8 +403,9 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
requestObject.put("center",center);
requestObject.put("title",title);
requestObject.put("creator",creator);
//requestObject.put("taskCode",taskCode+"_zf_"+userId);
requestObject.put("taskCode","weaver"+taskCode);
requestObject.put("nodeId",nodeId);
requestObject.put("nodeId",nodeId+userId);
requestObject.put("taskType",taskType);
requestObject.put("actionType",actionType);
requestObject.put("createDate",createdate+" "+createtime);
@ -415,9 +419,10 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
requestObject.put("ticketType",ticketType);
}
sql = " select t2.userid,h1.loginid\n" +
sql = " select t2.userid,h1.loginid,c1."+cus_staff+" as staffid "+
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+
" 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.isremark = '1' \n" +
@ -433,7 +438,7 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
String objectAction = "0" ;
String objectType = "0";
String objectCode = usercode ;
String objectId = "" ;
String objectId = rs.getString("staffid") ;
String operatorCode = usercode ;
taskObject.put("objectAction",objectAction);
@ -478,5 +483,11 @@ public class SendRemarkOperateTodoCmd extends AbstractCommandProxy<Map<String, O
// }
// return messageTitle;
// }
private String getShortMessageTitle(String messageTitle) {
if (messageTitle.length() > 20) {
messageTitle = messageTitle.substring(0, 17) + "...";
}
return messageTitle;
}
}

79
src/weaver/interfaces/dito/filter/HttpRequestUtil.java
Unescape Escape View File

@ -5,10 +5,8 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import weaver.conn.RecordSet;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.general.*;
import weaver.hrm.User;
import weaver.general.GCONST;
import weaver.interfaces.dito.comInfo.PropBean;
import weaver.login.VerifyLogin;
import javax.servlet.http.Cookie;
@ -132,8 +130,13 @@ public class HttpRequestUtil extends BaseBean{
*/
public void userSessionFilter(HttpServletRequest request, HttpServletResponse response, ServletContext application,String staffCode,String uid){
BaseBean bb = new BaseBean();
initLicenseInfo();
String path = PropBean.getUfPropValue("ecologypath");
boolean isMutiLangua = Util.isEnableMultiLang();
bb.writeLog("isMutiLangua:"+isMutiLangua);
//系统使用语言,未使用多语言的用户默认为中文。
int isLanguId = 8;
String languId = "8";
@ -143,10 +146,13 @@ public class HttpRequestUtil extends BaseBean{
if (isLanguId == 0) {
isLanguId = 8;
}
languId = String.valueOf(isLanguId);
bb.writeLog("languId:"+languId);
Cookie syslanid = new Cookie("Systemlanguid", languId);
syslanid.setMaxAge(-1);
syslanid.setPath(path);
syslanid.setPath("/");
response.addCookie(syslanid);
}
@ -180,6 +186,7 @@ public class HttpRequestUtil extends BaseBean{
newUser.setSex(rs.getString("sex"));
newUser.setPwd(rs.getString("password"));
String languageIdWeaver = rs.getString("systemlanguage");
bb.writeLog("languageIdWeaver:"+languageIdWeaver);
newUser.setLanguage(Util.getIntValue(languageIdWeaver, 8));
if (!languId.equalsIgnoreCase(languageIdWeaver) && isMutiLangua) {
User.setUserLang(rs.getInt("id"), Util.getIntValue(languId, 8));
@ -214,7 +221,7 @@ public class HttpRequestUtil extends BaseBean{
newUser.setLastlogindate(rs.getString("currentdate"));
newUser.setLogintype("1");
newUser.setAccount(rs.getString("account"));
newUser.setLoginip(request.getRemoteAddr());
newUser.setLoginip(Util.getIpAddr(request));
String weaverLoginType = Util.null2String(request.getSession(true).getAttribute("weaver_login_type"));
if("".equals(weaverLoginType)){
weaverLoginType = "1";
@ -244,9 +251,28 @@ public class HttpRequestUtil extends BaseBean{
List accounts = verifyLogin.getAccountsById(newUser.getUID());
request.getSession(true).setAttribute("accounts", accounts);
}
Util.setCookie(response, "loginidweaver", newUser.getUID()+"", -1);
}
Map logmessages = (Map) application.getAttribute("logmessages");
if (logmessages == null) {
logmessages = new WHashMap();
logmessages.put(newUser.getUID(), "");
application.setAttribute("logmessages", logmessages);
}
String loginuuids = newUser.getUID() + "";
rs.executeQuery("select id from hrmresource where status in(0,1,2,3) and belongto = ? ", newUser.getUID());
if (rs.next()) {
if (loginuuids.length() > 0){
loginuuids = loginuuids + ",";
}
loginuuids = loginuuids + rs.getInt("id");
}
Cookie ckloginuuids = new Cookie("loginuuids", loginuuids);
ckloginuuids.setMaxAge(-1);
ckloginuuids.setPath("/");
response.addCookie(ckloginuuids);
Map userSessions = (Map) application.getAttribute("userSessions");
String uId = String.valueOf(newUser.getUID());
if (userSessions == null) {
@ -265,4 +291,45 @@ public class HttpRequestUtil extends BaseBean{
}
}
public void initLicenseInfo(){
BaseBean bb = new BaseBean();
try{
StaticObj staticobj = StaticObj.getInstance();
String software = (String) staticobj.getObject("software");
bb.writeLog("software："+software);
String portal = "n";
String multilanguage = "n";
if (software == null) {
RecordSet rs = new RecordSet();
rs.executeQuery("select * from license");
if (rs.next()) {
software = rs.getString("software");
bb.writeLog("software2："+software);
if (software.equals("")) {
software = "ALL";
}
staticobj.putObject("software", software);
portal = rs.getString("portal");
bb.writeLog("portal："+portal);
if (portal.equals("")) {
portal = "n";
}
staticobj.putObject("portal", portal);
multilanguage = rs.getString("multilanguage");
bb.writeLog("multilanguage："+multilanguage);
if (multilanguage.equals("")) {
multilanguage = "n";
}
staticobj.putObject("multilanguage", multilanguage);
}
}
}catch (Exception e){
}
}
}

187
src/weaver/interfaces/dito/mq/RocketmqUtil.java
Unescape Escape View File

@ -14,6 +14,7 @@ import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.resource.ResourceComInfo;
import weaver.hrm.roles.RolesComInfo;
import weaver.interfaces.dito.comInfo.PropBean;
import weaver.systeminfo.systemright.CheckUserRight;
import java.text.SimpleDateFormat;
import java.util.*;
@ -190,30 +191,33 @@ public class RocketmqUtil {
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,
pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员信息更新sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","人员信息更新sql执行错误");
}else {
dataMap.put("errmessage","人员信息更新sql执行成功");
}
recordErrorData(dataMap);
}else if("D".equals(actType)){
status = "5";
String userUpdateSql = " update hrmresource set status=? where workcode=? ";
bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员离职更新sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","人员离职更新sql执行错误");
}else {
dataMap.put("errmessage","人员离职更新sql执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -244,14 +248,16 @@ public class RocketmqUtil {
creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime,
locationid,seclevel,createrid,lastmodid});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员新增sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","人员新增sql执行错误");
}else {
dataMap.put("errmessage","人员新增sql执行成功");
}
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
@ -357,14 +363,16 @@ public class RocketmqUtil {
bb.writeLog("deptUpdateSql:"+deptUpdateSql);
boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,subcompanyid1,orgId,supdepid,orgCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新部门SQL语句执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","更新部门SQL语句执行错误");
}else {
dataMap.put("errmessage","更新部门SQL语句执行成功");
}
recordErrorData(dataMap);
}else if("D".equalsIgnoreCase(actType))
{
canceled = "1";
@ -382,15 +390,16 @@ public class RocketmqUtil {
bb.writeLog("deptUpdateSql:"+deptUpdateSql);
boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","封存部门SQL语句执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","封存部门SQL语句执行错误");
}else {
dataMap.put("errmessage","封存部门SQL语句执行成功");
}
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
@ -407,14 +416,16 @@ public class RocketmqUtil {
bb.writeLog("deptInsertSql:"+deptInsertSql);
boolean flag = rs.executeUpdate(deptInsertSql,new Object[]{departmentmark,departmentmark,orgCode,subcompanyid1,supdepid,orgId});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增部门SQL语句执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","新增部门SQL语句执行错误");
}else {
dataMap.put("errmessage","新增部门SQL语句执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -552,14 +563,16 @@ public class RocketmqUtil {
String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?";
boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId);
bb.writeLog("delHrmrolemembersSql : " + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","角色成员新增失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","角色成员新增失败");
}else {
dataMap.put("errmessage","角色成员新增成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -573,14 +586,16 @@ public class RocketmqUtil {
String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmrolemembersSql, new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()});
bb.writeLog("insertHrmrolemembersSql : " + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","角色成员新增失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","角色成员新增失败");
}else {
dataMap.put("errmessage","角色成员新增成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -611,6 +626,11 @@ public class RocketmqUtil {
RolemembersComInfo RolemembersComInfo = new RolemembersComInfo();
RolemembersComInfo.removeCache();
CheckUserRight CheckUserRight = new CheckUserRight();
CheckUserRight.removeMemberRoleCache();
CheckUserRight.removeRoleRightdetailCache();
}
@ -645,6 +665,7 @@ public class RocketmqUtil {
String systemUserCode = Util.null2String(jsonObject.get("systemUserCode"));
String orgCode = Util.null2String(jsonObject.get("orgCode"));
String actType = Util.null2String(jsonObject.get("actType"));
String defaultFlag = Util.null2String(jsonObject.get("defaultFlag"));
String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间
String updateStaff = Util.null2String(jsonObject.get("updateStaff"));
if(StringUtils.isEmpty(updateStaff)){
@ -685,32 +706,39 @@ public class RocketmqUtil {
{
if("A".equals(actType) || "M".equals(actType))
{
//当岗位为主岗位时才更新，1：主岗位
if ("1".equals(defaultFlag)){
String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? ";
bb.writeLog("updateUserJobSql:"+updateUserJobSql);
boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId});
bb.writeLog(" updateUserJobFlag: "+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新人员岗位sql执行错误");
dataMap.put("systable",tableName);
if(!flag){
dataMap.put("errmessage","更新人员岗位sql执行错误");
}else {
dataMap.put("errmessage","更新人员岗位sql执行成功");
}
recordErrorData(dataMap);
}
}else if("D".equals(actType)){
jobtitlesId = "" ;
jobtitlesId = null;
String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? ";
bb.writeLog("updateUserJobSql:"+updateUserJobSql);
boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId});
bb.writeLog(" updateUserJobFlag: "+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","删除人员岗位sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","删除人员岗位sql执行错误");
}else {
dataMap.put("errmessage","删除人员岗位sql执行成功");
}
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
@ -815,14 +843,16 @@ public class RocketmqUtil {
String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?";
boolean flag = rs.executeUpdate(updateHrmrolesSql, new Object[]{sysRoleName, sysRoleName, rolesid});
bb.writeLog("updateHrmroles : " + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统角色更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","系统角色更新SQL执行错误");
}else {
dataMap.put("errmessage","系统角色更新SQL执行成功");
}
recordErrorData(dataMap);
}else if("D".equals(actType)) {
int membercount = 0;
String queryHrmRolesSql = " select id from hrmrolemembers where roleid = ?";
@ -833,14 +863,16 @@ public class RocketmqUtil {
if(membercount == 0){
String deleteHrmRolesSql = " delete from hrmroles where id = ?";
boolean flag = rs.executeUpdate(deleteHrmRolesSql,rolesid);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统角色删除SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","系统角色删除SQL执行错误");
}else {
dataMap.put("errmessage","系统角色删除SQL执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -862,14 +894,16 @@ public class RocketmqUtil {
String insertHrmrolesSql = " insert into hrmroles(rolesmark,rolesname,type,subcompanyid,ecology_pinyin_search,uuid) values(?,?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmrolesSql,new Object[]{rolesmark,rolesname,type,subcompanyid,sysRoleCode, uuid});
bb.writeLog("insertHrmroles : "+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增系统角色SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","新增系统角色SQL执行错误");
}else {
dataMap.put("errmessage","新增系统角色SQL执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -1002,27 +1036,31 @@ public class RocketmqUtil {
String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?";
boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, modified, modifier, jobtitleid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","系统岗位更新SQL执行错误");
}else {
dataMap.put("errmessage","系统岗位更新SQL执行成功");
}
recordErrorData(dataMap);
} else if ("D".equals(actType)) {
String canceled = "1";
String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=?,canceled = ? where id=?";
boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql,new Object[]{jobtitlemark, jobtitlename, modified, modifier, canceled, jobtitleid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位封存SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","系统岗位封存SQL执行错误");
}else {
dataMap.put("errmessage","系统岗位封存SQL执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -1037,14 +1075,16 @@ public class RocketmqUtil {
String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位新增SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if (!flag) {
dataMap.put("errmessage","系统岗位新增SQL执行错误");
}else {
dataMap.put("errmessage","系统岗位新增SQL执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -1089,8 +1129,10 @@ public class RocketmqUtil {
String lastmodid = "1" ;
String creator = "1";
String systemlanguage = "8" ;
String pwd = "1";
String pwd = PropBean.getUfPropValue("user_pwd") ;
String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密
bb.writeLog("password:"+password);
String scopeid = "-1";
String scope = "HrmCustomFieldByInfoType" ;
@ -1176,28 +1218,32 @@ public class RocketmqUtil {
bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","人员更新SQL执行错误");
}else {
dataMap.put("errmessage","人员更新SQL执行成功");
}
recordErrorData(dataMap);
}else if("D".equals(actType)){
status = "5";
String userUpdateSql = " update hrmresource set status=? where workcode=? ";
bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode});
bb.writeLog("flag:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员离职SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!flag){
dataMap.put("errmessage","人员离职SQL执行错误");
}else {
dataMap.put("errmessage","人员离职SQL执行成功");
}
recordErrorData(dataMap);
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
@ -1225,16 +1271,17 @@ public class RocketmqUtil {
creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime,
locationid,seclevel,createrid,lastmodid});
bb.writeLog("flag:"+flag);
if(flag){
userid = id+"";
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员新增SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(flag){
userid = id+"";
dataMap.put("errmessage","人员新增SQL执行成功");
}else{
dataMap.put("errmessage","人员新增SQL执行错误");
}
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
@ -1258,26 +1305,30 @@ public class RocketmqUtil {
String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=? where scope=? and scopeid=? and id=?";
bb.writeLog(cusUpdateSql);
boolean deflag = rs.executeUpdate(cusUpdateSql, new Object[]{staffId, eId, scope,scopeid,userid});
if(!deflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新人员自定义信息失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!deflag){
dataMap.put("errmessage","更新人员自定义信息失败");
}else {
dataMap.put("errmessage","更新人员自定义信息成功");
}
recordErrorData(dataMap);
} else {
String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+") values(?,?,?,?,?)";
bb.writeLog(cusInsertSql);
boolean deflag = rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, userid, staffId, eId});
if(!deflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增人员自定义信息失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
if(!deflag){
dataMap.put("errmessage","新增人员自定义信息失败");
}else {
dataMap.put("errmessage","新增人员自定义信息成功");
}
recordErrorData(dataMap);
}
}
}else{

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

@ -122,6 +122,7 @@ public class SendRequestData2PortalInterfaces implements SendRequestStatusDataIn
rsojson.put("isremark",rso.getIsremark());
rsojson.put("id",rso.getUser().getUID());
rsojson.put("loginid",rso.getUser().getLoginid());
rsojson.put("creater",rso.getCreator().getLoginid());
rsojson.put("noedid",rso.getNodeid());
// rsojson.put("viewtype",rso.getViewtype());
// rsojson.put("receivedatetime",rso.getReceivedate()+" "+rso.getReceivetime()+"/"+rso.getOperatedate()+" "+rso.getOperatetime());

Write Preview
Loading…
Cancel
Save