From 1e5d5ca5a9a6e72b300cfd73a05ccad66674f7bb Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Tue, 19 Dec 2023 10:03:33 +0800 Subject: [PATCH] =?UTF-8?q?#EC=5FHJ154#=20=E4=BA=BA=E5=91=98MQ=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E3=80=81=E5=A4=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AEMQ=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/dito/mq/HrmRocketmqUtil.java | 47 +- .../interfaces/dito/mq/RocketmqUtil.java | 906 +++++++++++------- 2 files changed, 603 insertions(+), 350 deletions(-) diff --git a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java index 6341ab26..5d836c27 100644 --- a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java @@ -7,6 +7,8 @@ import weaver.conn.RecordSet; import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; import weaver.general.Util; +import weaver.hrm.company.DepartmentComInfo; +import weaver.hrm.resource.ResourceComInfo; import weaver.interfaces.dito.comInfo.PropBean; import java.text.SimpleDateFormat; @@ -78,19 +80,37 @@ public class HrmRocketmqUtil { if(StringUtils.isNotEmpty(personid) && StringUtils.isNotEmpty(managerid)) { Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable","hrmresource"); sql = " update hrmresource h set h.managerid = ? where id = ? "; - boolean flag = rs.executeUpdate(sql,new Object[]{managerid,personid}); + + Object[] objects = new Object[]{managerid,personid} ; + + boolean flag = rs.executeUpdate(sql,objects); bb.writeLog("flag:"+flag); + if(!flag){ errcount++; dataMap.put("errmessage","人员更新SQL执行错误,managerid:"+managerid+"、personid:"+personid); + dataMap.put("zxjg","false"); }else{ dataMap.put("errmessage","人员更新SQL执行成功"); + dataMap.put("zxjg","true"); + + ResourceComInfo resComInfo; + try { + resComInfo = new ResourceComInfo(); + resComInfo.removeResourceCache(); + } catch (Exception e) { + bb.writeLog(e); + } } + + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable","hrmresource"); + dataMap.put("zxyj",sql); + dataMap.put("zxcs",convertObject2String(objects)); + dataMap.put("personno",personno); recordErrorData(dataMap); }else{ @@ -99,7 +119,9 @@ public class HrmRocketmqUtil { dataMap.put("reqmessage",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数personno、managerno在cus_fielddata查询为空"); + dataMap.put("personno",personno); recordErrorData(dataMap); + } }else{ @@ -118,6 +140,7 @@ public class HrmRocketmqUtil { dataMap.put("reqmessage",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数status不为1"); + dataMap.put("personno",personno); recordErrorData(dataMap); } @@ -140,6 +163,7 @@ public class HrmRocketmqUtil { dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数缺少masterInfo"); recordErrorData(dataMap); + } }catch (Exception e){ bb.writeLog("e:"+e); @@ -184,7 +208,7 @@ public class HrmRocketmqUtil { String systable = Util.null2String(dataMap.get("systable")); if(!reqmessage.contains("\\\"")){ - reqmessage = reqmessage.replace("\"","\\\""); + reqmessage = reqmessage.replace("\"","\""); } int bool = 0; @@ -219,4 +243,17 @@ public class HrmRocketmqUtil { } } + + public static String convertObject2String(Object[] obj) { + String datas = ""; + if (null != obj) { + for (int i = 0; i < obj.length; i++) { + String data = obj[i].toString(); + System.out.println(data); + datas += org.apache.commons.lang3.StringUtils.isBlank(datas) ? data : "," + data; + } + } + return datas; + } + } diff --git a/src/weaver/interfaces/dito/mq/RocketmqUtil.java b/src/weaver/interfaces/dito/mq/RocketmqUtil.java index 56cd544e..83dfebe3 100644 --- a/src/weaver/interfaces/dito/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/RocketmqUtil.java @@ -7,7 +7,7 @@ import com.cloudstore.dev.api.bean.MessageType; import com.cloudstore.dev.api.util.Util_Message; import okhttp3.*; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; @@ -105,304 +105,304 @@ public class RocketmqUtil { * @param jsonArray */ public void updateSysUserData(JSONArray jsonArray, String tableName){ - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - String nowDateTime = sdf.format(new Date()); - String locationid = "2" ; - String seclevel = "20" ; - String createrid = "1" ; - String lastmodid = "1" ; - String creator = "1"; - String systemlanguage = "8" ; - String currentDate = TimeUtil.getCurrentDateString();//当前日期 - String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 - - String jobTitleId = "" ; - String defaultJobCode = PropBean.getUfPropValue("defaultJobCode"); - if(StringUtils.isNotEmpty(defaultJobCode)){ - String sql = " select id from hrmjobtitles where jobtitlecode = ?" ; - rs.executeQuery(sql,new Object[]{defaultJobCode}); - if(rs.next()){ - jobTitleId = Util.null2String(rs.getString("id")); - } - } - - for(int i=0;i dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - 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); - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - if(!flag){ - dataMap.put("errmessage","人员离职更新sql执行错误"); - }else { - dataMap.put("errmessage","人员离职更新sql执行成功"); - } - recordErrorData(dataMap); - }else{ - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员系统中已存在，操作类型为A"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - - String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为A，请检查数据" ; - recordErrorMessage(staffCode,context); - } - }else{ - if("A".equalsIgnoreCase(actType)) - { - int status1count = 0; - sql = " select id from hrmresource where loginid = ? and status in(0,1,2,3) " ; - bb.writeLog("sql:"+sql); - rs.executeQuery(sql,new Object[]{staffCode}); - if(rs.next()){ - status1count++; - } - bb.writeLog("status1count:"+status1count); - - if(status1count == 0) { - int status5count = 0; - List loginList = new ArrayList(); - sql = " select id,status from hrmresource where loginid = ? and status = 5"; - rs.executeQuery(sql, new Object[]{staffCode}); - while (rs.next()) { - String user_id = Util.null2String(rs.getString("id")); - String upsql = " update hrmresource set loginid='" + staffCode + "_" + status5count + "' where id = " + user_id; - bb.writeLog("upsql:" + upsql); - loginList.add(upsql); - status5count++; - } - bb.writeLog("status5count:"+status5count); - if (status5count > 0) { - for (String upsql : loginList) { - boolean isTrue = rs.executeUpdate(upsql); - bb.writeLog("isTrue:"+isTrue); - } - } - - String pwd = "1"; - String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 - bb.writeLog("password:"+password); - - rs.executeProc("HrmResourceMaxId_Get", ""); - rs.next(); - String id = "" + rs.getInt(1); - bb.writeLog("id:"+id); - - if(StringUtils.isNotEmpty(id)){ - String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + - "creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + - "locationid,seclevel,createrid,lastmodid) " + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - bb.writeLog("userInsertSql:"+userInsertSql); - boolean flag = rs.executeUpdate(userInsertSql,new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, - creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, - locationid,seclevel,createrid,lastmodid}); - bb.writeLog("flag:"+flag); - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - if(!flag){ - dataMap.put("errmessage","人员新增sql执行错误"); - }else { - dataMap.put("errmessage","人员新增sql执行成功"); - } - recordErrorData(dataMap); - } - }else{ - - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员:"+staffCode+"在系统中已存在，操作类型为A"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - - String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为A，请检查数据" ; - recordErrorMessage(staffCode,context); - } - }else{ - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员在系统中不存在，操作类型为M或者D"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - - String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中不存在，操作类型为M或者D，请检查数据" ; - recordErrorMessage(staffCode,context); - } - } - }else{ - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员所属部门为空"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - - String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工所属部门为空，请检查数据" ; - recordErrorMessage(staffCode,context); - } - }else{ - - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",datacount+""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","工号:"+staffCode+"的员工现为在职"+datacount+"组数据，无法进行处理"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - - String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工现为在职"+datacount+"组数据，请检查数据" ; - recordErrorMessage(staffCode,context); - - } - - }catch (Exception e){ - Map dataMap = new HashMap(); - dataMap.put("staffcodecount",""); - dataMap.put("staffcode",staffCode); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人力资源异常："+e.getMessage()); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - } - } +// RecordSet rs = new RecordSet(); +// BaseBean bb = new BaseBean(); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); +// String nowDateTime = sdf.format(new Date()); +// String locationid = "2" ; +// String seclevel = "20" ; +// String createrid = "1" ; +// String lastmodid = "1" ; +// String creator = "1"; +// String systemlanguage = "8" ; +// String currentDate = TimeUtil.getCurrentDateString();//当前日期 +// String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 +// +// String jobTitleId = "" ; +// String defaultJobCode = PropBean.getUfPropValue("defaultJobCode"); +// if(StringUtils.isNotEmpty(defaultJobCode)){ +// String sql = " select id from hrmjobtitles where jobtitlecode = ?" ; +// rs.executeQuery(sql,new Object[]{defaultJobCode}); +// if(rs.next()){ +// jobTitleId = Util.null2String(rs.getString("id")); +// } +// } +// +// for(int i=0;i dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("systable",tableName); +// 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); +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("systable",tableName); +// if(!flag){ +// dataMap.put("errmessage","人员离职更新sql执行错误"); +// }else { +// dataMap.put("errmessage","人员离职更新sql执行成功"); +// } +// recordErrorData(dataMap); +// }else{ +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","人员系统中已存在，操作类型为A"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// +// String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为A，请检查数据" ; +// recordErrorMessage(staffCode,context); +// } +// }else{ +// if("A".equalsIgnoreCase(actType)) +// { +// int status1count = 0; +// sql = " select id from hrmresource where loginid = ? and status in(0,1,2,3) " ; +// bb.writeLog("sql:"+sql); +// rs.executeQuery(sql,new Object[]{staffCode}); +// if(rs.next()){ +// status1count++; +// } +// bb.writeLog("status1count:"+status1count); +// +// if(status1count == 0) { +// int status5count = 0; +// List loginList = new ArrayList(); +// sql = " select id,status from hrmresource where loginid = ? and status = 5"; +// rs.executeQuery(sql, new Object[]{staffCode}); +// while (rs.next()) { +// String user_id = Util.null2String(rs.getString("id")); +// String upsql = " update hrmresource set loginid='" + staffCode + "_" + status5count + "' where id = " + user_id; +// bb.writeLog("upsql:" + upsql); +// loginList.add(upsql); +// status5count++; +// } +// bb.writeLog("status5count:"+status5count); +// if (status5count > 0) { +// for (String upsql : loginList) { +// boolean isTrue = rs.executeUpdate(upsql); +// bb.writeLog("isTrue:"+isTrue); +// } +// } +// +// String pwd = "1"; +// String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 +// bb.writeLog("password:"+password); +// +// rs.executeProc("HrmResourceMaxId_Get", ""); +// rs.next(); +// String id = "" + rs.getInt(1); +// bb.writeLog("id:"+id); +// +// if(StringUtils.isNotEmpty(id)){ +// String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + +// "creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + +// "locationid,seclevel,createrid,lastmodid) " + +// " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; +// bb.writeLog("userInsertSql:"+userInsertSql); +// boolean flag = rs.executeUpdate(userInsertSql,new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, +// creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, +// locationid,seclevel,createrid,lastmodid}); +// bb.writeLog("flag:"+flag); +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("systable",tableName); +// if(!flag){ +// dataMap.put("errmessage","人员新增sql执行错误"); +// }else { +// dataMap.put("errmessage","人员新增sql执行成功"); +// } +// recordErrorData(dataMap); +// } +// }else{ +// +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","人员:"+staffCode+"在系统中已存在，操作类型为A"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// +// String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为A，请检查数据" ; +// recordErrorMessage(staffCode,context); +// } +// }else{ +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","人员在系统中不存在，操作类型为M或者D"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// +// String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中不存在，操作类型为M或者D，请检查数据" ; +// recordErrorMessage(staffCode,context); +// } +// } +// }else{ +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","人员所属部门为空"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// +// String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工所属部门为空，请检查数据" ; +// recordErrorMessage(staffCode,context); +// } +// }else{ +// +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",datacount+""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","工号:"+staffCode+"的员工现为在职"+datacount+"组数据，无法进行处理"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// +// String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工现为在职"+datacount+"组数据，请检查数据" ; +// recordErrorMessage(staffCode,context); +// +// } +// +// }catch (Exception e){ +// Map dataMap = new HashMap(); +// dataMap.put("staffcodecount",""); +// dataMap.put("staffcode",staffCode); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","人力资源异常："+e.getMessage()); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// } +// } } // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode": @@ -479,7 +479,10 @@ public class RocketmqUtil { String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?," + " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; bb.writeLog("deptUpdateSql:"+deptUpdateSql); - boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,subcompanyid1,orgId,supdepid,orgCode}); + + Object[] objects = new Object[]{departmentmark,departmentmark,subcompanyid1,orgId,supdepid,orgCode} ; + + boolean flag = rs.executeUpdate(deptUpdateSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -490,6 +493,10 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","更新部门SQL语句执行成功"); } + + dataMap.put("zxyj",deptUpdateSql); + dataMap.put("zxcs",convertObject2String(objects)); + dataMap.put("staffcode",orgCode); recordErrorData(dataMap); }else if("D".equalsIgnoreCase(actType)) { @@ -504,9 +511,12 @@ public class RocketmqUtil { if(hrmResourceCount == 0 ){ String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," + - " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; + " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; bb.writeLog("deptUpdateSql:"+deptUpdateSql); - boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode}); + + Object[] objects = new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode}; + + boolean flag = rs.executeUpdate(deptUpdateSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -517,6 +527,10 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","封存部门SQL语句执行成功"); } + + dataMap.put("zxyj",deptUpdateSql); + dataMap.put("zxcs",convertObject2String(objects)); + dataMap.put("staffcode",orgCode); recordErrorData(dataMap); } }else{ @@ -525,6 +539,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","部门在系统中已存在，操作类型为A"); dataMap.put("systable",tableName); + dataMap.put("staffcode",orgCode); recordErrorData(dataMap); } }else{ @@ -532,7 +547,10 @@ public class RocketmqUtil { { String deptInsertSql = " insert into hrmdepartment(departmentmark,departmentname,departmentcode,subcompanyid1,supdepid,showorder) values(?,?,?,?,?,?) "; bb.writeLog("deptInsertSql:"+deptInsertSql); - boolean flag = rs.executeUpdate(deptInsertSql,new Object[]{departmentmark,departmentmark,orgCode,subcompanyid1,supdepid,orgId}); + + Object[] objects = new Object[]{departmentmark,departmentmark,orgCode,subcompanyid1,supdepid,orgId}; + + boolean flag = rs.executeUpdate(deptInsertSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -543,6 +561,12 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","新增部门SQL语句执行成功"); } + + dataMap.put("zxyj",deptInsertSql); + dataMap.put("zxcs",convertObject2String(objects)); + + dataMap.put("staffcode",orgCode); + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -550,9 +574,10 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","部门在系统中不存在，操作类型为M或者D"); dataMap.put("systable",tableName); - recordErrorData(dataMap); + dataMap.put("staffcode",orgCode); + recordErrorData(dataMap); } } }else{ @@ -561,6 +586,9 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","部门所属分部在系统为空"); dataMap.put("systable",tableName); + + dataMap.put("staffcode",orgCode); + recordErrorData(dataMap); } }catch (Exception e){ @@ -569,6 +597,9 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","部门异常："+e.getMessage()); dataMap.put("systable",tableName); + + dataMap.put("staffcode",orgCode); + recordErrorData(dataMap); } } @@ -674,8 +705,8 @@ public class RocketmqUtil { bb.writeLog("departmentcode:"+departmentcode); bb.writeLog("istrue:"+(StringUtils.isNotBlank(departmentcode) && departmentcode.equals(orgCode))); - if(StringUtils.isNotBlank(departmentcode) && departmentcode.equals(orgCode)) - { +// if(StringUtils.isNotBlank(departmentcode)) +// { if(StringUtils.isNotEmpty(roleCode)) { String queryRoleIdSql = " select id from hrmroles where rolesmark=?"; @@ -699,8 +730,13 @@ public class RocketmqUtil { if ("D".equals(actType)) { // 不包含 角色 if(!set.contains(roleCode)){ + String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId); + bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); + + Object[] objects = new Object[]{releationId}; + + boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); bb.writeLog("delHrmrolemembersSql : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -711,22 +747,37 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","角色成员删除成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",delHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); } }else if("M".equals(actType)){ if("1100".equals(statusCd)){ String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId); + bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); + + Object[] objects = new Object[]{releationId}; + + boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); bb.writeLog("delHrmrolemembersSql : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + if (!flag) { dataMap.put("errmessage","角色成员删除失败"); }else { dataMap.put("errmessage","角色成员删除成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",delHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -734,6 +785,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员系统已存在，操作类型为"+actType+",statusCd为:"+statusCd); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } }else{ @@ -742,12 +794,17 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员系统已存在，操作类型为A"); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } } else { if ("A".equals(actType)) { + 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:"+insertHrmrolemembersSql); + Object[] objects = new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()} ; + boolean flag = rs.executeUpdate(insertHrmrolemembersSql,objects); + bb.writeLog("insertHrmrolemembersSql : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -758,11 +815,20 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","角色成员新增成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",insertHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else if("M".equals(actType)){ if("1000".equals(statusCd)){ 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:"+insertHrmrolemembersSql); + + Object[] objects = new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()} ; + + boolean flag = rs.executeUpdate(insertHrmrolemembersSql, objects); bb.writeLog("insertHrmrolemembersSql : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -773,6 +839,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","角色成员新增成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",insertHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -780,6 +851,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员系统不存在，操作类型为"+actType+",statusCd为:"+statusCd); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } }else{ @@ -788,6 +860,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员系统不存在，操作类型为D"); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } } @@ -797,22 +870,26 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","人员角色数据，人员或者角色系统不存在"); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } - }else{ - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","数据中的orgCode:"+orgCode+"和"+systemUserName+"所属的部门编码不一致,无法更新数据"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); - } +// } else{ +// Map dataMap = new HashMap(); +// dataMap.put("syndate",nowDateTime); +// dataMap.put("reqmessage",jsonObject.toJSONString()); +// dataMap.put("errmessage","数据中的orgCode:"+orgCode+"和"+systemUserName+"所属的部门编码不一致,无法更新数据"); +// dataMap.put("systable",tableName); +// recordErrorData(dataMap); +// } } catch (Exception e) { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员异常："+e.getMessage()); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); + + recordErrorData(dataMap); } } @@ -904,7 +981,9 @@ public class RocketmqUtil { // 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}); + Object[] objects = new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}; + + boolean flag = rs.executeUpdate(updateUserJobSql,objects); bb.writeLog(" updateUserJobFlag: "+flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -915,13 +994,23 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","更新人员岗位sql执行成功"); } + + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",updateUserJobSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); // } }else if("D".equals(actType)){ 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}); + + Object[] objects = new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}; + + + boolean flag = rs.executeUpdate(updateUserJobSql,objects); bb.writeLog(" updateUserJobFlag: "+flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -932,6 +1021,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","删除人员岗位sql执行成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",updateUserJobSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); } }else{ @@ -940,6 +1034,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","人员岗位中岗位或者人员ID在系统中不存在"); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } }catch (Exception e){ @@ -948,6 +1043,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","人员岗位异常："+e.getMessage()); dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } } @@ -1035,7 +1131,11 @@ public class RocketmqUtil { if (StringUtils.isNotEmpty(rolesid)){ if ("M".equals(actType)) { //修改 String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?"; - boolean flag = rs.executeUpdate(updateHrmrolesSql, new Object[]{sysRoleCode, sysRoleName, rolesid}); + bb.writeLog("updateHrmrolesSql:"+updateHrmrolesSql); + + Object[] objects = new Object[]{sysRoleCode, sysRoleName, rolesid} ; + + boolean flag = rs.executeUpdate(updateHrmrolesSql, objects); bb.writeLog("updateHrmroles : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -1046,6 +1146,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","系统角色更新SQL执行成功"); } + + dataMap.put("staffcode",sysRoleCode); + dataMap.put("zxyj",updateHrmrolesSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else if("D".equals(actType)) { int membercount = 0; @@ -1056,7 +1161,11 @@ public class RocketmqUtil { } if(membercount == 0){ String deleteHrmRolesSql = " delete from hrmroles where id = ?"; - boolean flag = rs.executeUpdate(deleteHrmRolesSql,rolesid); + + Object[] objects = new Object[]{rolesid} ; + + boolean flag = rs.executeUpdate(deleteHrmRolesSql,objects); + Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); @@ -1066,6 +1175,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","系统角色删除SQL执行成功"); } + + dataMap.put("staffcode",sysRoleCode); + dataMap.put("zxyj",deleteHrmRolesSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -1073,6 +1187,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统角色存在角色成员，无法删除系统角色"); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysRoleCode); recordErrorData(dataMap); } }else{ @@ -1081,13 +1196,18 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","角色成员系统已存在，操作类型为A"); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysRoleCode); recordErrorData(dataMap); } }else { if ("A".equals(actType)){ //新增 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}); + + Object[] objects = new Object[]{rolesmark,rolesname,type,subcompanyid,sysRoleCode, uuid}; + + boolean flag = rs.executeUpdate(insertHrmrolesSql,objects); bb.writeLog("insertHrmroles : "+flag); + Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); @@ -1097,6 +1217,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","新增系统角色SQL执行成功"); } + + dataMap.put("zxyj",insertHrmrolesSql); + dataMap.put("zxcs",convertObject2String(objects)); + + dataMap.put("staffcode",sysRoleCode); recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -1104,6 +1229,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统角色系统不存在，操作类型为M或者D"); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysRoleCode); recordErrorData(dataMap); } } @@ -1117,6 +1243,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统角色："+e.getMessage()); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysRoleCode); recordErrorData(dataMap); } } @@ -1228,7 +1355,10 @@ public class RocketmqUtil { { if ("M".equals(actType)) { //修改 String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?"; - boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, modified, modifier, jobtitleid}); + + Object[] objects = new Object[]{jobtitlemark, jobtitlename, modified, modifier, jobtitleid} ; + + boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql,objects); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -1239,11 +1369,19 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","系统岗位更新SQL执行成功"); } + + dataMap.put("zxyj",updateHrmjobactivitiesSql); + dataMap.put("zxcs",convertObject2String(objects)); + dataMap.put("staffcode",sysPostCode); + 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}); + + Object[] objects = new Object[]{jobtitlemark, jobtitlename, modified, modifier, canceled, jobtitleid} ; + + boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql,objects); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -1254,6 +1392,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","系统岗位封存SQL执行成功"); } + + dataMap.put("zxyj",updateHrmjobactivitiesSql); + dataMap.put("zxcs",convertObject2String(objects)); + + dataMap.put("staffcode",sysPostCode); recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -1261,13 +1404,17 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统岗位系统已存在，操作类型为A"); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysPostCode); recordErrorData(dataMap); } }else{ if ("A".equals(actType)) { //新增 String uuid = UUID.randomUUID().toString(); 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}); + + Object[] objects = new Object[]{jobtitlemark, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid} ; + + boolean flag = rs.executeUpdate(insertHrmjobactivitiesSql,objects); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -1278,6 +1425,11 @@ public class RocketmqUtil { }else { dataMap.put("errmessage","系统岗位新增SQL执行成功"); } + dataMap.put("staffcode",sysPostCode); + + dataMap.put("zxyj",insertHrmjobactivitiesSql); + dataMap.put("zxcs",convertObject2String(objects)); + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); @@ -1285,6 +1437,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统岗位系统不存在，操作类型为D或者M"); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysPostCode); recordErrorData(dataMap); } } @@ -1295,6 +1448,7 @@ public class RocketmqUtil { dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("errmessage","系统角色："+e.getMessage()); dataMap.put("systable",tableName); + dataMap.put("staffcode",sysPostCode); recordErrorData(dataMap); } @@ -1453,9 +1607,12 @@ public class RocketmqUtil { bb.writeLog("status:"+status); String userUpdateSql = " update hrmresource set loginid=?,lastname=?,departmentid=?,subcompanyid1=?," + - " creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; + " creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; + + Object[] objects = new Object[]{loginid,lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,status,loginedNum,currentDate,currentDateTime,staffCode}; + bb.writeLog("updateSysUserData-userUpdateSql:"+userUpdateSql); - boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{loginid,lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,status,loginedNum,currentDate,currentDateTime,staffCode}); + boolean flag = rs.executeUpdate(userUpdateSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); @@ -1463,6 +1620,11 @@ public class RocketmqUtil { dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",userUpdateSql); + dataMap.put("zxcs",convertObject2String(objects)); + + if(!flag){ dataMap.put("errmessage","人员更新SQL执行错误"); }else { @@ -1472,8 +1634,11 @@ public class RocketmqUtil { }else if("D".equals(actType)){ status = "5"; String userUpdateSql = " update hrmresource set status=? where workcode=? "; + + Object[] objects = new Object[]{status,staffCode}; bb.writeLog("userUpdateSql:"+userUpdateSql); - boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode}); + + boolean flag = rs.executeUpdate(userUpdateSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); @@ -1481,6 +1646,10 @@ public class RocketmqUtil { dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",userUpdateSql); + dataMap.put("zxcs",convertObject2String(objects)); + if(!flag){ dataMap.put("errmessage","人员离职SQL执行错误"); }else { @@ -1527,13 +1696,17 @@ public class RocketmqUtil { if(StringUtils.isNotEmpty(id)) { String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + - " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + - " locationid,seclevel,createrid,lastmodid,outkey) " + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - bb.writeLog("userInsertSql:"+userInsertSql); - boolean flag = rs.executeUpdate(userInsertSql,new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, + " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + + " locationid,seclevel,createrid,lastmodid,outkey) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + + Object[] objects = new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, - locationid,seclevel,createrid,lastmodid,staffId}); + locationid,seclevel,createrid,lastmodid,staffId} ; + bb.writeLog("userInsertSql:"+userInsertSql); + + + boolean flag = rs.executeUpdate(userInsertSql,objects); bb.writeLog("flag:"+flag); Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); @@ -1541,6 +1714,10 @@ public class RocketmqUtil { dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",userInsertSql); + dataMap.put("zxcs",convertObject2String(objects)); + if(flag){ userid = id+""; dataMap.put("errmessage","人员新增SQL执行成功"); @@ -1607,19 +1784,30 @@ public class RocketmqUtil { { String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + - " locationid,seclevel,createrid,lastmodid) " + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - bb.writeLog("userInsertSql:"+userInsertSql); - boolean flag = rs.executeUpdate(userInsertSql,new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, + " locationid,seclevel,createrid,lastmodid,outkey) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + + Object[] objects = new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, - locationid,seclevel,createrid,lastmodid}); + locationid,seclevel,createrid,lastmodid,staffId} ; + bb.writeLog("userInsertSql:"+userInsertSql); + + + + boolean flag = rs.executeUpdate(userInsertSql,objects); bb.writeLog("flag:"+flag); + + Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); dataMap.put("staffcode",staffCode); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",userInsertSql); + dataMap.put("zxcs",convertObject2String(objects)); + if(flag){ userid = id+""; dataMap.put("errmessage","人员新增SQL执行成功"); @@ -1668,13 +1856,20 @@ public class RocketmqUtil { if (StringUtils.isNotEmpty(seqorder)) { String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=?,"+cus_sysuserid+"=? where scope=? and scopeid=? and id=?"; bb.writeLog(cusUpdateSql); - boolean deflag = rs.executeUpdate(cusUpdateSql, new Object[]{staffId, eId, sysUserId, scope,scopeid,userid}); + + Object[] objects = new Object[]{staffId, eId, sysUserId, scope,scopeid,userid} ; + + boolean deflag = rs.executeUpdate(cusUpdateSql, objects); Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); dataMap.put("staffcode",staffCode); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",cusUpdateSql); + dataMap.put("zxcs",convertObject2String(objects)); + if(!deflag){ dataMap.put("errmessage","更新人员自定义信息失败"); }else { @@ -1684,13 +1879,19 @@ public class RocketmqUtil { } else { String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+","+cus_sysuserid+") values(?,?,?,?,?,?)"; bb.writeLog(cusInsertSql); - boolean deflag = rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, userid, staffId, eId, sysUserId}); + Object[] objects = new Object[]{scope, scopeid, userid, staffId, eId, sysUserId} ; + + boolean deflag = rs.executeUpdate(cusInsertSql, objects); Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); dataMap.put("staffcode",staffCode); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable",tableName); + + dataMap.put("zxyj",cusInsertSql); + dataMap.put("zxcs",convertObject2String(objects)); + if(!deflag){ dataMap.put("errmessage","新增人员自定义信息失败"); }else { @@ -1776,10 +1977,13 @@ public class RocketmqUtil { String staffcodecount = Util.null2String(dataMap.get("staffcodecount")); String staffcode = Util.null2String(dataMap.get("staffcode")); + String zxyj = Util.null2String(dataMap.get("zxyj")); + String zxcs = Util.null2String(dataMap.get("zxcs")); + int bool = 0; - sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode)" + - " values(?,?,?,?,?,?,?,?,?,?,?,?)" ; - boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode}); + sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode,zxyj,zxcs)" + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ; + boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode,zxyj,zxcs}); bb.writeLog("sql;"+sql); if(flag){ bool++; @@ -1901,4 +2105,16 @@ public class RocketmqUtil { return set; } + public static String convertObject2String(Object[] obj) { + String datas = ""; + if (null != obj) { + for (int i = 0; i < obj.length; i++) { + String data = obj[i].toString(); + System.out.println(data); + datas += StringUtils.isBlank(datas) ? data : "," + data; + } + } + return datas; + } + }