diff --git a/src/weaver/interfaces/mq/RocketmqUtil.java b/src/weaver/interfaces/mq/RocketmqUtil.java index 11dc6b4b..013cbe8b 100644 --- a/src/weaver/interfaces/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/mq/RocketmqUtil.java @@ -5,12 +5,17 @@ import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; +import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; import weaver.general.TimeUtil; import weaver.general.Util; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.resource.ResourceComInfo; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.UUID; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -19,7 +24,6 @@ public class RocketmqUtil { private Lock lock = new ReentrantLock(); public int updateOrgData(String data) { - BaseBean bb = new BaseBean(); int errcount = 0; try{ @@ -36,42 +40,22 @@ public class RocketmqUtil { if(requestObject.containsKey("tableName") && requestObject.containsKey("content")) { String tableName = requestObject.getString("tableName"); + JSONArray jsonArray = requestObject.getJSONArray("content"); bb.writeLog("tableName:"+tableName); if("organization".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount1 = updasteSysOrgData(jsonArray); - bb.writeLog("errcount1:"+errcount1); - errcount += errcount1; + updasteSysOrgData(jsonArray,tableName); }else if("system_user".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount2 = updateSysUserData(jsonArray); - bb.writeLog("errcount2:"+errcount2); - errcount += errcount2; + updateSysUserData(jsonArray,tableName); }else if("system_roles".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount3 = updasteSysRoleData(jsonArray); - bb.writeLog("errcount3:"+errcount3); - errcount += errcount3; + updasteSysRoleData(jsonArray,tableName); }else if("system_post".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount4 = updasteSysPostData(jsonArray); - bb.writeLog("errcount4:"+errcount4); - errcount += errcount4; + updasteSysPostData(jsonArray,tableName); }else if("system_user_role".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount5 = updateSystemUserRoleData(jsonArray); - bb.writeLog("errcount5:"+errcount5); - errcount += errcount5; - }else if("system_user_post".equals(tableName)){ // system_user_post - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount6 = updateSystemUserPostData(jsonArray); - bb.writeLog("errcount6:"+errcount6); - errcount += errcount6; + updateSystemUserRoleData(jsonArray,tableName); + }else if("system_user_post".equals(tableName)){ + updateSystemUserPostData(jsonArray,tableName); }else if("staff".equals(tableName)){ - JSONArray jsonArray = requestObject.getJSONArray("content"); - int errcount2 = updateStaffData(jsonArray); - bb.writeLog("errcount2:"+errcount2); - errcount += errcount2; + updateStaffData(jsonArray,tableName); } } } @@ -82,32 +66,31 @@ public class RocketmqUtil { }finally { lock.unlock(); } - - bb.writeLog("errcount:"+errcount); return errcount; } + + //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"}, + // "svcCode":"70300100030001","requestObject":[{"content":[ + // {"statusDate":"2022-07-18 11:25:41","updateDate":"2022-07-22 10:52:56", + // "regionNbr":"1","expDate":"2999-12-31 23:59:59","userOrgId":"2", + // "password":"{bcrypt}$2a$10$wQrGr6zHlqaKbAZGaK7PC.VdmZdq4HJn6t7R4XpGsf/yKqPj6smHq", + // "effDate":"2021-07-13 10:33:57","orgCode":"2", + // "staffName":"zhouhan","pwdNewtime":"2022-05-18 14:42:15", + // "pwdContinErrCnt":"0","actType":"M","sysUserId":"14002","email":"2112@qq.com", + // "createDate":"2021-07-13 10:33:58","staffCode":"zhouhan", + // "sysUserCode":"zhouhan","pwdErrCnt":"0","pwdEffectDays":"90","statusCd":"1000", + // "systemInfoId":"-1","userName":"zhouhan","createStaff":"1","pwdStatus":"1100", + // "regionId":"731","pwdSmsTel":"21423523523","loginedNum":"78","staffId":"12002", + // "updateStaff":"1"}],"tableName":"system_user","primaryKey":"sysUserId"}],"key":"svcCont"} /*** * * @param jsonArray */ - public int updateSysUserData(JSONArray jsonArray){ + public void updateSysUserData(JSONArray jsonArray,String tableName){ RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); - - //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"}, - // "svcCode":"70300100030001","requestObject":[{"content":[ - // {"statusDate":"2022-07-18 11:25:41","updateDate":"2022-07-22 10:52:56", - // "regionNbr":"1","expDate":"2999-12-31 23:59:59","userOrgId":"2", - // "password":"{bcrypt}$2a$10$wQrGr6zHlqaKbAZGaK7PC.VdmZdq4HJn6t7R4XpGsf/yKqPj6smHq", - // "effDate":"2021-07-13 10:33:57","orgCode":"2", - // "staffName":"zhouhan","pwdNewtime":"2022-05-18 14:42:15", - // "pwdContinErrCnt":"0","actType":"M","sysUserId":"14002","email":"2112@qq.com", - // "createDate":"2021-07-13 10:33:58","staffCode":"zhouhan", - // "sysUserCode":"zhouhan","pwdErrCnt":"0","pwdEffectDays":"90","statusCd":"1000", - // "systemInfoId":"-1","userName":"zhouhan","createStaff":"1","pwdStatus":"1100", - // "regionId":"731","pwdSmsTel":"21423523523","loginedNum":"78","staffId":"12002", - // "updateStaff":"1"}],"tableName":"system_user","primaryKey":"sysUserId"}],"key":"svcCont"} - + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String nowDateTime = sdf.format(new Date()); String locationid = "2" ; String seclevel = "20" ; String createrid = "1" ; @@ -127,7 +110,6 @@ public class RocketmqUtil { } } - int errcount = 0; for(int i=0;i dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员信息更新sql执行错误"); + dataMap.put("systable",tableName); + 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){ - errcount++; + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员离职更新sql执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员系统中已存在，操作类型为A"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + if("A".equalsIgnoreCase(actType)) + { + 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); + if(!flag){ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员新增sql执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员不在系统中，操作类型为M或者D"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员所属部门为空"); + 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); + recordErrorData(dataMap); } } - return errcount; } - - public int updasteSysOrgData(JSONArray jsonArray){ - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - int errcount = 0; - // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode": // "70300100030001","requestObject":[{"content":[{ // "updateDate":"2022-07-22 11:05:22","orgName":"testOrg722","parentOrgCode":"LNP000001", @@ -262,7 +281,16 @@ public class RocketmqUtil { // "parRegionNbr":"1", // "createDate":"2022-07-22 11:05:22" // }],"tableName":"organization","primaryKey":"orgId"}],"key":"svcCont"} - + /**** + * + * @param jsonArray + * @return + */ + public void updasteSysOrgData(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()); for(int i=0;i dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","更新部门SQL语句执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else if("D".equalsIgnoreCase(actType)) + { + canceled = "1"; + + int hrmResourceCount = 0 ; + String queryHrmResourceSql = " select id from hrmresource where departmentid = ? and status !=5 " ; + rs.executeQuery(queryHrmResourceSql,new Object[]{deptid}); + if(rs.next()){ + hrmResourceCount++; } + + if(hrmResourceCount == 0 ){ + String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," + + " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","封存部门SQL语句执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + + } + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","部门在系统中已存在，操作类型为A"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } - } - }else{ - if("A".equalsIgnoreCase(actType)) - { - 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}); - bb.writeLog("flag:"+flag); - if(!flag){ - errcount++; + }else{ + if("A".equalsIgnoreCase(actType)) + { + 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}); + bb.writeLog("flag:"+flag); + if(!flag){ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","新增部门SQL语句执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","部门在系统中不存在，操作类型为M或者D"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","部门所属分部在系统为空"); + 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); + recordErrorData(dataMap); } } - return errcount; } // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode": @@ -379,13 +443,7 @@ public class RocketmqUtil { // "actType":"A","sysUserId":"20047","createDate":"2022-07-22 11:08:33"}], // "tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} - /*** - * - * @param jsonArray - */ - public static int updateSystemUserRoleData(JSONArray jsonArray) { - -// {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", + // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", // "requestObject":[{"content":[{"sysUserRoleId":"23503","updateDate":"2022-07-27 09:32:48","systemInfoCode":"TYMH", // "hisId":"20182","sysRoleId":"17015","statusCd":"1100","hasUserRole":false,"systemInfoId":"727001", // "operType":"1000","systemUserCode":"testQian722","expDate":"2120-01-01 00:00:00","orgId":"2","createStaff":"1", @@ -395,13 +453,13 @@ public class RocketmqUtil { // "primaryKey":"sysUserRoleId"}],"key":"svcCont"} - //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", - // "requestObject":[{"content":[{"sysUserRoleId":"24031","updateDate":"2022-08-09 10:26:15","systemInfoCode":"TYMH", - // "sysRoleId":"17020","statusCd":"1000","systemInfoId":"727001","systemUserCode":"weaver12", - // "expDate":"2120-01-01 00:00:00","orgId":"11205","createStaff":"1","effDate":"2022-08-09 10:26:16", - // "systemUserName":"weaver12","orgCode":"GTR000593","roleCode":"weaver role","manageClass":"1000", - // "roleName":"weaver role","actType":"A","sysUserId":"20104","createDate":"2022-08-09 10:26:15"}], - // "tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} + //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", + // "requestObject":[{"content":[{"sysUserRoleId":"24031","updateDate":"2022-08-09 10:26:15","systemInfoCode":"TYMH", + // "sysRoleId":"17020","statusCd":"1000","systemInfoId":"727001","systemUserCode":"weaver12", + // "expDate":"2120-01-01 00:00:00","orgId":"11205","createStaff":"1","effDate":"2022-08-09 10:26:16", + // "systemUserName":"weaver12","orgCode":"GTR000593","roleCode":"weaver role","manageClass":"1000", + // "roleName":"weaver role","actType":"A","sysUserId":"20104","createDate":"2022-08-09 10:26:15"}], + // "tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", @@ -414,14 +472,28 @@ public class RocketmqUtil { // "roleName":"TestRole02","actType":"D","sysUserId":"28025","createDate":"2022-10-24 19:10:19", // "updateStaff":"1"}],"tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} - int errcount = 0 ; + /*** + * + * @param jsonArray + */ + public void updateSystemUserRoleData(JSONArray jsonArray,String tableName) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String nowDateTime = sdf.format(new Date()); + + String rolelevel = "2" ; //总部=2;分部=1;部门=0 + String resourcetype = "1"; //1=人力资源 + RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); - for (int i = 0; i < jsonArray.size(); i++) { + + for (int i = 0; i < jsonArray.size(); i++) + { JSONObject jsonObject = jsonArray.getJSONObject(i); String systemInfoCode = Util.null2String(jsonObject.get("systemInfoCode")); - if("PC_OA".equalsIgnoreCase(systemInfoCode)){ - String roleCode = Util.null2String(jsonObject.get("roleCode")).replace(" ",""); + if("PC_OA".equalsIgnoreCase(systemInfoCode)) + { + String roleCode = Util.null2String(jsonObject.get("roleCode")).replace(" ", ""); String roleName = Util.null2String(jsonObject.get("roleName")); String systemUserCode = Util.null2String(jsonObject.get("systemUserCode")); @@ -429,75 +501,105 @@ public class RocketmqUtil { String actType = Util.null2String(jsonObject.get("actType")); String statusCd = Util.null2String(jsonObject.get("statusCd")); - bb.writeLog("statusCd:"+statusCd+" actType:"+actType); + bb.writeLog("statusCd:" + statusCd + " actType:" + actType); - String rolelevel = "2" ; //总部=2;分部=1;部门=0 - String resourcetype = "1"; //1=人力资源 + try { - if(StringUtils.isNotEmpty(systemUserCode)){ String userId = ""; String roleId = ""; - String sql = " select id from hrmresource where loginid=?" ; - rs.executeQuery(sql,new Object[]{systemUserCode}); - if(rs.next()){ - userId = Util.null2String(rs.getString("id")); + if (StringUtils.isNotEmpty(systemUserCode)) { + String sql = " select id from hrmresource where loginid=?"; + rs.executeQuery(sql, new Object[]{systemUserCode}); + if (rs.next()) { + userId = Util.null2String(rs.getString("id")); + } } - String queryRoleIdSql = "select id from hrmroles where ecology_pinyin_search=?"; - rs.executeQuery(queryRoleIdSql,roleCode); - if (rs.next()){ - roleId = rs.getString("id"); - } + if(StringUtils.isNotEmpty(roleCode)) { - bb.writeLog("userId:"+userId+" roleId:"+roleId); + String queryRoleIdSql = "select id from hrmroles where ecology_pinyin_search=?"; + rs.executeQuery(queryRoleIdSql, new Object[]{roleCode}); + if (rs.next()) { + roleId = rs.getString("id"); + } + } + bb.writeLog("userId:" + userId + " roleId:" + roleId); - if (StringUtils.isNotEmpty(userId) && StringUtils.isNotEmpty(roleId)){ + if (StringUtils.isNotEmpty(userId) && StringUtils.isNotEmpty(roleId)) { //查看是否已存在角色用户关系 String releationId = ""; String ifExistSql = "select id from hrmrolemembers where roleid=? and resourceid=?"; - rs.executeQuery(ifExistSql,roleId,userId); - if (rs.next()){ + rs.executeQuery(ifExistSql,new Object[]{roleId, userId}); + if (rs.next()) { releationId = rs.getString("id"); } - bb.writeLog("userId:"+userId+" roleId:"+roleId+"releationId:"+releationId); - if(StringUtils.isNotEmpty(releationId)){ - if("D".equals(actType)){ + bb.writeLog("userId:" + userId + " roleId:" + roleId + "releationId:" + releationId); + if (StringUtils.isNotEmpty(releationId)) { + if ("D".equals(actType)) { String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - boolean flag = rs.executeUpdate(delHrmrolemembersSql,releationId); - bb.writeLog("delHrmrolemembersSql : "+flag); - if(!flag){ - errcount++; + boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId); + bb.writeLog("delHrmrolemembersSql : " + flag); + if (!flag) { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员新增失败"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统已存在，操作类型为A或者M"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } - }else{ - if("A".equals(actType)){ + } else { + if ("A".equals(actType)) { String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; - boolean flag = rs.executeUpdate(insertHrmrolemembersSql,roleId,userId,rolelevel,resourcetype,UUID.randomUUID().toString()); - bb.writeLog("insertHrmrolemembersSql : "+flag); - if(!flag){ - errcount++; + boolean flag = rs.executeUpdate(insertHrmrolemembersSql, new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()}); + bb.writeLog("insertHrmrolemembersSql : " + flag); + if (!flag) { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员新增失败"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统不存在，操作类型为M或者D"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员角色数据，人员或者角色系统不存在"); + 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); + recordErrorData(dataMap); } } } - - return errcount; } - /*** - * - * @param jsonArray - */ - public static int updateSystemUserPostData(JSONArray jsonArray) { - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - int errcount = 0 ; -//{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", + //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", // "requestObject":[{"content":[{"updateDate":"2022-07-27 09:32:48","systemInfoCode":"TYMH","relType":"1100","orgId":"2", // "sysUserPostId":"123089","orgType":"1000","systemUserName":"testQian722","orgCode":"2","postName":"testXiao", // "staffName":"testQian722","actType":"D","sysUserId":"20055","createDate":"2022-07-25 15:43:24","defaultFlag":"0", @@ -506,100 +608,114 @@ public class RocketmqUtil { // "postCode":"testXiao","staffId":22021,"updateStaff":"1"}],"tableName":"system_user_post", // "primaryKey":"sysUserPostId"}],"key":"svcCont"} - bb.writeLog("jsonArray:"+jsonArray); + /*** + * + * @param jsonArray + */ + public void updateSystemUserPostData(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()); for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); -// String postName = Util.null2String(jsonObject.get("postName")); String postCode = Util.null2String(jsonObject.get("postCode")); - String systemUserCode = Util.null2String(jsonObject.get("systemUserCode")); -// String systemUserName = Util.null2String(jsonObject.get("systemUserName")); String orgCode = Util.null2String(jsonObject.get("orgCode")); String actType = Util.null2String(jsonObject.get("actType")); String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 String updateStaff = Util.null2String(jsonObject.get("updateStaff")); - if("".equals(updateStaff)){ + if(StringUtils.isEmpty(updateStaff)){ updateStaff = "1"; } - bb.writeLog("systemUserCode:"+systemUserCode); - if(StringUtils.isNotEmpty(systemUserCode)){ - String userId = ""; - String jobtitlesId = ""; - String departmentId = ""; - - String querDepartmentIdSql = " select id from hrmdepartment where departmentcode=? "; - bb.writeLog("querDepartmentIdSql:"+querDepartmentIdSql); - rs.executeQuery(querDepartmentIdSql,orgCode); - if (rs.next()){ - departmentId = rs.getString("id"); - } + String userId = ""; + String jobtitlesId = ""; + String departmentId = ""; - if(!"".equals(departmentId)){ - String sql = " select id from hrmresource where workcode=? and departmentid = ?" ; - bb.writeLog("sql:"+sql); - rs.executeQuery(sql,new Object[]{systemUserCode,departmentId}); - if(rs.next()){ + try { + if(StringUtils.isNotEmpty(orgCode)){ + String querDepartmentIdSql = " select id from hrmdepartment where departmentcode=? "; + bb.writeLog("querDepartmentIdSql:"+querDepartmentIdSql); + rs.executeQuery(querDepartmentIdSql,new Object[]{orgCode}); + if (rs.next()){ + departmentId = rs.getString("id"); + } + } + if(StringUtils.isNotEmpty(departmentId) && StringUtils.isNotEmpty(systemUserCode)) + { + String sql = " select id from hrmresource where workcode=? and departmentid = ?"; + bb.writeLog("sql:" + sql); + rs.executeQuery(sql, new Object[]{systemUserCode, departmentId}); + if (rs.next()) { userId = Util.null2String(rs.getString("id")); } } - - String queryRoleIdSql = " select id from hrmjobtitles where jobtitlecode=? "; - bb.writeLog("queryRoleIdSql:"+queryRoleIdSql); - rs.executeQuery(queryRoleIdSql,postCode); - if (rs.next()){ - jobtitlesId = rs.getString("id"); + if(StringUtils.isNotEmpty(postCode)) { + String queryRoleIdSql = " select id from hrmjobtitles where jobtitlecode=? "; + bb.writeLog("queryRoleIdSql:" + queryRoleIdSql); + rs.executeQuery(queryRoleIdSql, new Object[]{postCode}); + if (rs.next()) { + jobtitlesId = rs.getString("id"); + } } - - bb.writeLog("departmentId:"+departmentId); bb.writeLog("jobtitlesId:"+jobtitlesId); - - if(StringUtils.isNotEmpty(jobtitlesId)) + if(StringUtils.isNotEmpty(jobtitlesId) && StringUtils.isNotEmpty(userId)) { - if (StringUtils.isNotEmpty(userId) ) + if("A".equals(actType) || "M".equals(actType)) { - if("A".equals(actType) || "M".equals(actType)) - { - String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; - bb.writeLog("updateUserJobSql:"+updateUserJobSql); - boolean flag = rs.executeUpdate(updateUserJobSql,jobtitlesId,currentDateTime,updateStaff,userId); - bb.writeLog(" updateUserJobFlag: "+flag); - if(!flag){ - errcount++; - } - }else if("D".equals(actType)){ - jobtitlesId = "" ; - String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; - bb.writeLog("updateUserJobSql:"+updateUserJobSql); - boolean flag = rs.executeUpdate(updateUserJobSql,jobtitlesId,currentDateTime,updateStaff,userId); - bb.writeLog(" updateUserJobFlag: "+flag); - if(!flag){ - errcount++; - } + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","更新人员岗位sql执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else if("D".equals(actType)){ + jobtitlesId = "" ; + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","删除人员岗位sql执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员岗位中岗位或者人员ID在系统中不存在"); + 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); + recordErrorData(dataMap); } } - return errcount; } - - - /*** - * - * @param jsonArray - */ - public static int updasteSysRoleData(JSONArray jsonArray) { - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - - int errcount = 0; - // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", // "requestObject":[{"content":[{"updateDate":"2022-08-09 10:24:01", // "systemInfoCode":"TYMH","regionNbr":"TST_PR_CSS","sysRoleId":"17020", @@ -620,99 +736,152 @@ public class RocketmqUtil { // "createStaff":"1","regionId":"36","sysRoleType":"1000","actType":"A","createDate":"2022-07-27 11:04:19"}], // "tableName":"system_roles","primaryKey":"sysRoleId"}],"key":"svcCont"} + /*** + * + * @param jsonArray + */ + public void updasteSysRoleData(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 type = "0"; + String subcompanyid = "0" ; + for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); - String systemInfoCode = Util.null2String(jsonObject.get("systemInfoCode")); - if("PC_OA".equalsIgnoreCase(systemInfoCode)){ - - //角色标识 - String sysRoleCode = Util.null2String(jsonObject.get("sysRoleCode")).replace(" ",""); - //角色名称 - String sysRoleName = Util.null2String(jsonObject.get("sysRoleName")); - //状态1000 有效，1100 无效 - String statusCd = Util.null2String(jsonObject.get("statusCd")); - //角色描述 + //角色标识 + String sysRoleCode = Util.null2String(jsonObject.get("sysRoleCode")).replace(" ",""); + //角色名称 + String sysRoleName = Util.null2String(jsonObject.get("sysRoleName")); + //状态1000 有效，1100 无效 + String statusCd = Util.null2String(jsonObject.get("statusCd")); + //角色描述 // String sysRoleDesc = Util.null2String(jsonObject.get("sysRoleDesc")); - //角色类型1100：管理角色，1000：普通角色 - String sysRoleType = Util.null2String(jsonObject.get("sysRoleType")); - //A:新增，M:修改 - String actType = Util.null2String(jsonObject.get("actType")); + //角色类型1100：管理角色，1000：普通角色 + String sysRoleType = Util.null2String(jsonObject.get("sysRoleType")); + //A:新增，M:修改 + String actType = Util.null2String(jsonObject.get("actType")); + + + bb.writeLog("sysRoleName:"+sysRoleName); + bb.writeLog("sysRoleCode:"+sysRoleCode); +// String rolesmark = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`~" ; +// String rolesname = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`~" ; - bb.writeLog("sysRoleName:"+sysRoleName); - bb.writeLog("sysRoleCode:"+sysRoleCode); + String rolesmark = sysRoleName ; + String rolesname = sysRoleName ; - String rolesmark = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`9 "+sysRoleName+"`~`~" ; - String rolesname = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`9 "+sysRoleName+"`~`~" ; - bb.writeLog("rolesmark:"+rolesmark); - bb.writeLog("rolesname:"+rolesname); + bb.writeLog("rolesmark:"+rolesmark); + bb.writeLog("rolesname:"+rolesname); - String type = "0"; - String subcompanyid = "0" ; + String systemInfoCode = Util.null2String(jsonObject.get("systemInfoCode")); + if("PC_OA".equalsIgnoreCase(systemInfoCode)){ String uuid = UUID.randomUUID().toString(); - String queryRoleSql = "select id from hrmroles where ecology_pinyin_search=?"; - rs.executeQuery(queryRoleSql,sysRoleCode); - bb.writeLog(queryRoleSql); String rolesid = ""; - if (rs.next()){ - rolesid = rs.getString("id"); - } - bb.writeLog("rolesid:"+rolesid); - if (StringUtils.isNotEmpty(rolesid)){ - if ("M".equals(actType)) { //修改 - String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?"; - boolean flag = rs.executeUpdate(updateHrmrolesSql, sysRoleName, sysRoleName, rolesid); - bb.writeLog("updateHrmroles : " + flag); - if (!flag) { - errcount++; - } - }else if ("D".equals(actType)) { - int membercount = 0; - String queryHrmRolesSql = " select id from hrmrolemembers where roleid = ?"; - rs.executeQuery(queryHrmRolesSql,new Object[]{rolesid}); - while (rs.next()){ - membercount++; - } - if(membercount == 0){ - String deleteHrmRolesSql = " delete from hrmroles where id = ?"; - rs.executeUpdate(deleteHrmRolesSql,rolesid); + try{ + if(StringUtils.isNotEmpty(sysRoleCode)){ + String queryRoleSql = "select id from hrmroles where ecology_pinyin_search=?"; + rs.executeQuery(queryRoleSql,new Object[]{sysRoleCode}); + bb.writeLog(queryRoleSql); + if (rs.next()){ + rolesid = rs.getString("id"); } } - }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}); - bb.writeLog("insertHrmroles : "+flag); - if(!flag){ - errcount++; + bb.writeLog("rolesid:"+rolesid); + if (StringUtils.isNotEmpty(rolesid)){ + if ("M".equals(actType)) { //修改 + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统角色更新SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else if("D".equals(actType)) { + int membercount = 0; + String queryHrmRolesSql = " select id from hrmrolemembers where roleid = ?"; + rs.executeQuery(queryHrmRolesSql,new Object[]{rolesid}); + while (rs.next()){ + membercount++; + } + if(membercount == 0){ + String deleteHrmRolesSql = " delete from hrmroles where id = ?"; + boolean flag = rs.executeUpdate(deleteHrmRolesSql,rolesid); + if(!flag){ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统角色删除SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统角色存在角色成员，无法删除系统角色"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统已存在，操作类型为A"); + dataMap.put("systable",tableName); + 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}); + bb.writeLog("insertHrmroles : "+flag); + if(!flag){ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","新增系统角色SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统角色系统不存在，操作类型为M或者D"); + 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); + recordErrorData(dataMap); } - } } - return errcount; } - /*** - * - * @param jsonArray - */ - public static int updasteSysPostData(JSONArray jsonArray) { - RecordSet rs = new RecordSet(); - BaseBean bb = new BaseBean(); - - int errcount = 0; - - //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", - // "requestObject":[{"content":[{"updateDate":"2022-07-27 11:04:39","orgName":"Vivia","regionNbr":"TST_PR_CSS", - // "initFlag":"0","sysPostId":"18008","statusCd":"1000","systemInfoId":"727001", - // "sysPostType":"1000","orgId":"1","createStaff":"1","regionId":"36","orgCode":"LNP000001","sysPostCode":"position727", - // "actType":"A","sysPostDesc":"test727","sysPostName":"position727","createDate":"2022-07-27 11:04:39"}], - // "tableName":"system_post","primaryKey":"sysPostId"}],"key":"svcCont"} + //{"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", + // "requestObject":[{"content":[{"updateDate":"2022-07-27 11:04:39","orgName":"Vivia","regionNbr":"TST_PR_CSS", + // "initFlag":"0","sysPostId":"18008","statusCd":"1000","systemInfoId":"727001", + // "sysPostType":"1000","orgId":"1","createStaff":"1","regionId":"36","orgCode":"LNP000001","sysPostCode":"position727", + // "actType":"A","sysPostDesc":"test727","sysPostName":"position727","createDate":"2022-07-27 11:04:39"}], + // "tableName":"system_post","primaryKey":"sysPostId"}],"key":"svcCont"} // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", // "requestObject":[{"content":[{"updateDate":"2022-07-19 00:51:32", @@ -722,15 +891,30 @@ public class RocketmqUtil { // "sysPostCode":"CASH_ADMIN","actType":"M","sysPostDesc":"CASH_ADMIN","sysPostName":"CASH_ADMIN", // "createDate":"2020-11-13 11:02:11","updateStaff":"1"}],"tableName":"system_post","primaryKey":"sysPostId"}],"key":"svcCont"} + + /*** + * + * @param jsonArray + */ + public void updasteSysPostData(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 creater ="1"; + String modifier = "1" ; String created = TimeUtil.getCurrentTimeString() ; String modified = TimeUtil.getCurrentTimeString() ; - String modifier = "1" ; - for (int i = 0; i < jsonArray.size(); i++) { + + for (int i = 0; i < jsonArray.size(); i++) + { JSONObject jsonObject = jsonArray.getJSONObject(i); //系统岗位编码 String sysPostType = Util.null2String(jsonObject.get("sysPostType")); - if("1300".equals(sysPostType)){ + if("1300".equals(sysPostType)) + { String sysPostCode = Util.null2String(jsonObject.get("sysPostCode")); //系统岗位名称 String sysPostName = Util.null2String(jsonObject.get("sysPostName")); @@ -749,110 +933,135 @@ public class RocketmqUtil { //A:新增，M:修改 String actType = Util.null2String(jsonObject.get("actType")); - String departmentId = ""; - String querDepartmentIdSql = "select id from hrmdepartment where departmentcode=?"; - rs.executeQuery(querDepartmentIdSql, orgCode); - if (rs.next()) { - departmentId = rs.getString("id"); - } - - String allname = "~`~`7 " + sysPostName + "`~`8 " + sysPostName + "`~`~"; + //String allname = "~`~`7 " + sysPostName + "`~`8 " + sysPostName + "`~`~"; + + String jobtitlemark = sysPostName; + String jobtitlename = sysPostName; - String groupsid = ""; - String jobgroupname = "DITO_MSS_LEADERSHIP"; - String sql = " select * from hrmjobgroups where jobgroupname like '%"+jobgroupname+"%'"; - rs.executeQuery(sql); - if (rs.next()) { - groupsid = Util.null2String(rs.getString("id")); - } + try { + String departmentId = ""; + if(StringUtils.isNotEmpty(orgCode)){ + String querDepartmentIdSql = "select id from hrmdepartment where departmentcode=?"; + rs.executeQuery(querDepartmentIdSql, new Object[]{orgCode}); + if (rs.next()) { + departmentId = rs.getString("id"); + } + } - String jobactivitiesid = ""; - String jobactivityname = "MSS_LEADERSHIP"; - if (StringUtils.isNotEmpty(groupsid)) { - sql = " select id from hrmjobactivities where jobgroupid = ? and jobactivityname like '%"+jobactivityname+"%'"; - rs.executeQuery(sql, new Object[]{groupsid}); + String groupsid = ""; + String jobgroupname = "DITO_MSS_LEADERSHIP"; + String sql = " select * from hrmjobgroups where jobgroupname like '%"+jobgroupname+"%'"; + rs.executeQuery(sql); if (rs.next()) { - jobactivitiesid = Util.null2String(rs.getString("id")); + groupsid = Util.null2String(rs.getString("id")); } - if (StringUtils.isNotEmpty(jobactivitiesid)) { - - String jobtitlemark = allname; - String jobtitlename = allname; + String jobactivitiesid = ""; + String jobactivityname = "MSS_LEADERSHIP"; + if (StringUtils.isNotEmpty(groupsid) && StringUtils.isNotEmpty(jobactivityname)) { + sql = " select id from hrmjobactivities where jobgroupid = ? and jobactivityname like '%" + jobactivityname + "%'"; + rs.executeQuery(sql, new Object[]{groupsid}); + if (rs.next()) { + jobactivitiesid = Util.null2String(rs.getString("id")); + } + } - String queryRoleSql = "select id from hrmjobtitles where jobtitlecode=? and jobactivityid = ?"; - rs.executeQuery(queryRoleSql, sysPostCode, departmentId, jobactivitiesid); - String jobtitleid = ""; + String jobtitleid = ""; + if (StringUtils.isNotEmpty(jobactivitiesid)) + { + String queryRoleSql = " select id from hrmjobtitles where jobtitlecode =? and jobactivityid = ?"; + rs.executeQuery(queryRoleSql, new Object[]{sysPostCode, jobactivitiesid}); if (rs.next()) { jobtitleid = rs.getString("id"); } + } - if (StringUtils.isNotEmpty(jobtitleid)) { - if ("M".equals(actType)) { //修改 - String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?"; - boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql, jobtitlemark, jobtitlename, modified, modifier, jobtitleid); - bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); - if (!"".equals(flag)) { - errcount++; - } - } 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, jobtitlemark, jobtitlename, modified, modifier, canceled, jobtitleid); - bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); - if (!"".equals(flag)) { - errcount++; - } + if (StringUtils.isNotEmpty(jobtitleid)) + { + 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}); + bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); + if (!flag) { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统岗位更新SQL执行错误"); + dataMap.put("systable",tableName); + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统岗位封存SQL执行错误"); + dataMap.put("systable",tableName); + 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}); - bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); - if (!flag) { - errcount++; - } + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统岗位系统已存在，操作类型为A"); + dataMap.put("systable",tableName); + 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}); + bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); + if (!flag) { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统岗位新增SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","系统岗位系统不存在，操作类型为D或者M"); + 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); + recordErrorData(dataMap); + } } } - return errcount; } - /*** - * - */ - public void removeCache(){ - ResourceComInfo resComInfo; - DepartmentComInfo deptComInfo; - try { - resComInfo = new ResourceComInfo(); - resComInfo.removeResourceCache(); - deptComInfo = new DepartmentComInfo(); - deptComInfo.removeCompanyCache(); - } catch (Exception e) { - new BaseBean().writeLog(e); - } - } - + // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", + // "requestObject":[{"content":[{"statusDate":"2022-08-09 09:47:54","updateDate":"2022-08-09 09:47:54", + // "staffCode":"fanweiceshi12","orgName":"yhwgfz","regionNbr":"TST_PR_CSS", + // "staffAccount":"fanweiceshi12","statusCd":"1000","staffType":"1000","orgId":"11205","createStaff":"1", + // "eMail":"123453243132312","mobilePhone":"44553321","commonRegionId":"36","orgCode":"GTR000593", + // "staffName":"fanweiceshi12","actType":"A","sysUserId":20102,"partyId":"-1","staffId":"22061", + // "createDate":"2022-08-09 09:47:54","updateStaff":"1"}],"tableName":"staff","primaryKey":"staffId"}],"key":"svcCont"} - public int updateStaffData(JSONArray jsonArray){ + public void updateStaffData(JSONArray jsonArray,String tableName){ RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); - - // {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode":"70300100030001", - // "requestObject":[{"content":[{"statusDate":"2022-08-09 09:47:54","updateDate":"2022-08-09 09:47:54", - // "staffCode":"fanweiceshi12","orgName":"yhwgfz","regionNbr":"TST_PR_CSS", - // "staffAccount":"fanweiceshi12","statusCd":"1000","staffType":"1000","orgId":"11205","createStaff":"1", - // "eMail":"123453243132312","mobilePhone":"44553321","commonRegionId":"36","orgCode":"GTR000593", - // "staffName":"fanweiceshi12","actType":"A","sysUserId":20102,"partyId":"-1","staffId":"22061", - // "createDate":"2022-08-09 09:47:54","updateStaff":"1"}],"tableName":"staff","primaryKey":"staffId"}],"key":"svcCont"} - + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String nowDateTime = sdf.format(new Date()); String locationid = "2" ; String seclevel = "20" ; @@ -860,6 +1069,10 @@ public class RocketmqUtil { String lastmodid = "1" ; String creator = "1"; String systemlanguage = "8" ; + String pwd = "1"; + String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 + bb.writeLog("password:"+password); + String currentDate = TimeUtil.getCurrentDateString();//当前日期 String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 bb.writeLog("currentDate:"+currentDate); @@ -874,12 +1087,9 @@ public class RocketmqUtil { } } - int errcount = 0; for(int i=0;i dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员更新SQL执行错误"); + dataMap.put("systable",tableName); + 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 dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员离职SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员在系统中已存在，操作类型为A"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + }else{ + if("A".equalsIgnoreCase(actType)) + { + 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); + if(!flag){ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员新增SQL执行错误"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员系统中不存在，操作类型为M或者D"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); } } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员所属部门为空"); + 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); + recordErrorData(dataMap); } } - return errcount; + } + + + /*** + * + */ + public void recordErrorData(Map dataMap){ + + String uftable = "uf_orgmq" ; + RecordSet rs = new RecordSet(); + BaseBean bb = new BaseBean(); + ModeRightInfo mode=new ModeRightInfo(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期 + SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss"); + + int formmodeid = 0 ; + String modedatacreater = "1" ; + String modedatacreatertype = "0" ; + String modedatacreatedate = sdf1.format(new Date()); + String modedatacreatetime = sdf2.format(new Date()); + String uuid = UUID.randomUUID().toString(); + + try { + + String sql =" select k.id from modeinfo k \n" + + " inner join workflow_bill l on formid = l.id\n" + + " where l.tablename = ? " ; + rs.executeQuery(sql,new Object[]{uftable}); + if(rs.next()){ + formmodeid = Util.getIntValue(Util.null2String(rs.getString("id"))); + } + + String syndate = Util.null2String(dataMap.get("syndate")); + String reqmessage = Util.null2String(dataMap.get("reqmessage")); + String errmessage = Util.null2String(dataMap.get("errmessage")); + String systable = Util.null2String(dataMap.get("systable")); + + int bool = 0; + sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + + " values(?,?,?,?,?,?,?,?,?,?)" ; + boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable}); + bb.writeLog("sql;"+sql); + if(flag){ + bool++; + } + bb.writeLog("bool;"+bool); + if(bool>0) + { + String dataid = ""; + sql = " select * from "+uftable+" where uuid=? "; + bb.writeLog("sql:" + sql); + rs.executeQuery(sql,new Object[]{uuid}); + if (rs.next()) { + dataid = Util.null2String(rs.getString("id")); + } + bb.writeLog("sql:" + sql); + bb.writeLog("dataid:" + dataid); + bb.writeLog("modeid:" + formmodeid); + if (StringUtils.isNotEmpty(dataid)) + { + mode.setNewRight(true); + mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid)); + } + } + }catch (Exception e){ + bb.writeLog("e:"+e); + } + } + + /*** + * 更新系统组织换成 + */ + public void removeCache(){ + ResourceComInfo resComInfo; + DepartmentComInfo deptComInfo; + try { + resComInfo = new ResourceComInfo(); + resComInfo.removeResourceCache(); + deptComInfo = new DepartmentComInfo(); + deptComInfo.removeCompanyCache(); + } catch (Exception e) { + new BaseBean().writeLog(e); + } } } diff --git a/src/weaver/interfaces/util/SendMailUtil.java b/src/weaver/interfaces/util/SendMailUtil.java index 33762dbf..1afdb83f 100644 --- a/src/weaver/interfaces/util/SendMailUtil.java +++ b/src/weaver/interfaces/util/SendMailUtil.java @@ -74,11 +74,18 @@ public class SendMailUtil{ .addHeader("Content-Type", "application/json") .build(); Response response = client.newCall(request).execute(); + baseBean.writeLog("response.code():"+response.code()); + baseBean.writeLog("response.body():"+response.body().string()); + + if(response!=null && response.code() != 200){ + baseBean.writeLog(response.body().string()); + } } }catch (IOException e) { e.printStackTrace(); + baseBean.writeLog(e); }catch (Exception e){ - + baseBean.writeLog(e); } }