diff --git a/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java b/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java index 7539bc6c..58589530 100644 --- a/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java +++ b/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java @@ -47,7 +47,7 @@ public class MobileSsoLoginServiceImpl extends Service implements MobileSsoLogin requestMap.put("app_access_token", accessToken); //请求获取用户accessToken baseBean.writeLog("getUserAccessToken:" + requestMap.toString()); - String data = HttpUtils.doPost(userAccessTokenUrl, requestMap, null); + String data = HttpUtils.ssoLoginDoPost(userAccessTokenUrl, requestMap); baseBean.writeLog("getUserAccessTokenResult:" + data); JSONObject dataJson = JSONObject.parseObject(data); String resultCode = dataJson.getString("resultCode"); @@ -94,7 +94,7 @@ public class MobileSsoLoginServiceImpl extends Service implements MobileSsoLogin requestMap.put("auth_code", authCode); requestMap.put("app_access_token", accessToken); baseBean.writeLog("getUserInfo:" + requestMap.toString()); - String data = HttpUtils.doPost(userInfoUrl, requestMap, null); + String data = HttpUtils.ssoLoginDoPost(userInfoUrl, requestMap); baseBean.writeLog("getUserInfoResult:" + data); JSONObject dataJson = JSONObject.parseObject(data); String resultCode = dataJson.getString("resultCode"); @@ -134,7 +134,7 @@ public class MobileSsoLoginServiceImpl extends Service implements MobileSsoLogin requestMap.put("appKey", appKey); requestMap.put("appSecret", appSecret); baseBean.writeLog("getAccessToken:" + requestMap.toString()); - String data = HttpUtils.doPost(accessTokenUrl, requestMap, null); + String data = HttpUtils.ssoLoginDoPost(accessTokenUrl, requestMap); baseBean.writeLog("getAccessTokenResult:" + data); JSONObject dataJson = JSONObject.parseObject(data); String resultCode = dataJson.getString("resultCode"); diff --git a/src/weaver/interfaces/job/WorkflowSyncCronJob.java b/src/weaver/interfaces/job/WorkflowSyncCronJob.java index 0bce42c7..fd72a9d4 100644 --- a/src/weaver/interfaces/job/WorkflowSyncCronJob.java +++ b/src/weaver/interfaces/job/WorkflowSyncCronJob.java @@ -49,14 +49,14 @@ public class WorkflowSyncCronJob extends BaseCronJob { bb.writeLog("WorkflowSyncCronJob ALL start"); String currentTime = TimeUtil.getCurrentTimeString(); allSynchronizeWorkflow(bb, synchronizeFlowUrl, synchronizeUserUrl, center, workflowAuthTable, accountName, password); - writeTimeNode(timeNodeTable, currentTime, SYNC_ALL, TIME_NODE_USE_WORKFLOW_SYNC, timeNodeFormModeId); + writeTimeNode(bb, timeNodeTable, currentTime, SYNC_ALL, TIME_NODE_USE_WORKFLOW_SYNC, timeNodeFormModeId); } //增量同步使用增量同步方法 if (SYNC_INCREMENT.equals(syncType)) { bb.writeLog("WorkflowSyncCronJob INCREMENT start"); String currentTime = TimeUtil.getCurrentTimeString(); IncrementSynchronizeWorkflow(bb, synchronizeFlowUrl, synchronizeUserUrl, center, workflowAuthTable, timeNodeTable, accountName, password); - writeTimeNode(timeNodeTable, currentTime, SYNC_INCREMENT, TIME_NODE_USE_WORKFLOW_SYNC, timeNodeFormModeId); + writeTimeNode(bb, timeNodeTable, currentTime, SYNC_INCREMENT, TIME_NODE_USE_WORKFLOW_SYNC, timeNodeFormModeId); } } catch (Exception e) { bb.writeLog("流程推送异常", e.getMessage()); @@ -136,31 +136,31 @@ public class WorkflowSyncCronJob extends BaseCronJob { if (CollectionUtils.isNotEmpty(addWorkflowList)) { for (Map workflowMap : addWorkflowList) { String data = HttpUtils.doPost(synchronizeFlowUrl, workflowMap, headers); - bb.writeLog("增加流程", data); + bb.writeLog("增加流程" + workflowMap.get("flowCode"), data); //无法判断流程的更改类型,所以在流程变动同时修改 workflowMap.put("actionType", ACTION_TYPE_UPDATE); data = HttpUtils.doPost(synchronizeFlowUrl, workflowMap, headers); - bb.writeLog("修改流程", data); + bb.writeLog("修改流程" + workflowMap.get("flowCode"), data); } } //删除人员要在删除流程之前执行 if (CollectionUtils.isNotEmpty(delUserList)) { for (Map workflowMap : delUserList) { String data = HttpUtils.doPost(synchronizeUserUrl, workflowMap, headers); - bb.writeLog("删除人员", data); + bb.writeLog("删除人员" + workflowMap.get("staffCode"), data); } } if (CollectionUtils.isNotEmpty(delWorkflowList)) { for (Map workflowMap : delWorkflowList) { String data = HttpUtils.doPost(synchronizeFlowUrl, workflowMap, headers); - bb.writeLog("删除流程", data); + bb.writeLog("删除流程" + workflowMap.get("staffCode"), data); } } //调用人员同步方法 if (CollectionUtils.isNotEmpty(addUserList)) { for (Map workflowMap : addUserList) { String data = HttpUtils.doPost(synchronizeUserUrl, workflowMap, headers); - bb.writeLog("增加人员", data); + bb.writeLog("增加人员" + workflowMap.get("staffCode"), data); } } } @@ -238,9 +238,9 @@ public class WorkflowSyncCronJob extends BaseCronJob { * @param timeNodeUse 同步作用 * @param formmodeid 模块id */ - private void writeTimeNode(String timeNodeTable, String currentTime, String syncType, String timeNodeUse, String formmodeid) throws Exception { + private void writeTimeNode(BaseBean bb, String timeNodeTable, String currentTime, String syncType, String timeNodeUse, String formmodeid) throws Exception { RecordSet recordSet = new RecordSet(); - String sql = "SET IDENTITY_INSERT " + timeNodeTable + " ON insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)"; + String sql = ""; String dbType = recordSet.getDBType(); if ("mysql".equalsIgnoreCase(dbType)) { sql = "insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)"; @@ -249,6 +249,7 @@ public class WorkflowSyncCronJob extends BaseCronJob { } else if ("sqlserver".equalsIgnoreCase(dbType)) { sql = "SET IDENTITY_INSERT " + timeNodeTable + " ON insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)"; } - recordSet.executeUpdate(sql, IdGenerator.getNextId(timeNodeTable), formmodeid, syncType, currentTime, timeNodeUse); + boolean b = recordSet.executeUpdate(sql, IdGenerator.getNextId(timeNodeTable), formmodeid, syncType, currentTime, timeNodeUse); + bb.writeLog("writeTimeNode result:" + b); } } diff --git a/src/weaver/interfaces/mq/RocketmqServlet.java b/src/weaver/interfaces/mq/RocketmqServlet.java deleted file mode 100644 index 41a5e70f..00000000 --- a/src/weaver/interfaces/mq/RocketmqServlet.java +++ /dev/null @@ -1,118 +0,0 @@ -package weaver.interfaces.mq; - - -import com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer; -//import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; -//import com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; -//import com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently; -import com.alibaba.rocketmq.client.exception.MQClientException; -//import com.alibaba.rocketmq.common.message.MessageExt; -import com.alibaba.rocketmq.common.consumer.ConsumeFromWhere; -import com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel; -import weaver.general.BaseBean; -import weaver.interfaces.comInfo.PropBean; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class RocketmqServlet extends HttpServlet { - - @Override - public void init() throws ServletException - { - - BaseBean bb = new BaseBean(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - - bb.writeLog("initiated---进入时间："+sdf.format(new Date())); - bb.writeLog("***** resource model initiated"); - bb.writeLog("***** resource model initiated"); - bb.writeLog("***** resource model initiated"); - - try{ - //DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_nj"); - //DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("cbec-consumer-group_nj_133"); - //consumer.setNamesrvAddr("172.16.84.183:9001;172.16.84.187:9001"); -// consumer.subscribe("dataSync_topic_nj", "BPM"); -// consumer.setInstanceName("dataSync_topic_nj"); - - String consumerGroup = PropBean.getUfPropValue("consumerGroup"); - bb.writeLog("consumerGroup:"+consumerGroup); - DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerGroup); - - String namesrvAddr = PropBean.getUfPropValue("namesrvAddr"); - bb.writeLog("namesrvAddr:"+namesrvAddr); - consumer.setNamesrvAddr(namesrvAddr); - - String instanceName = PropBean.getUfPropValue("instanceName"); - bb.writeLog("instanceName:"+instanceName); - consumer.setInstanceName(instanceName); - consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - //consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET); - - String topic = PropBean.getUfPropValue("topic"); - String subExpression = PropBean.getUfPropValue("subExpression"); - - bb.writeLog("topic:"+topic); - bb.writeLog("subExpression:"+subExpression); - - consumer.subscribe(topic,subExpression); - consumer.setConsumeThreadMin(1); - consumer.setConsumeThreadMax(1); - consumer.setConsumeMessageBatchMaxSize(1); - consumer.setMessageModel(MessageModel.BROADCASTING); - consumer.registerMessageListener(new RocketMsgListener()); -// consumer.registerMessageListener(new RocketMsgOrderListener()); - - /** - * Consumer对象在使用之前必须要调用start初始化，初始化一次即可
- */ - consumer.start(); - bb.writeLog("Consumer Started."); - - }catch (MQClientException e){ - bb.writeLog("Consumer resource model initiated--MQClientException:"+e); - } - - bb.writeLog("***** resource model initiated"); - bb.writeLog("***** resource model initiated"); - bb.writeLog("***** resource model initiated"); - } - - - /** - * 实现 HttpServlet 的 doGet 方法，不作任何操作 - * @param request - * @param response - * @throws ServletException - * @throws IOException - */ - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request, response); - } - - /** - * 实现 HttpServlet 的 doPost 方法，不作任何操作 - * @param request - * @param response - * @throws ServletException - * @throws IOException - */ - - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - } - - @Override - public void destroy() - { - // 什么也不做 - } - -} diff --git a/src/weaver/interfaces/mq/RocketmqUtil.java b/src/weaver/interfaces/mq/RocketmqUtil.java deleted file mode 100644 index 95481c7c..00000000 --- a/src/weaver/interfaces/mq/RocketmqUtil.java +++ /dev/null @@ -1,1315 +0,0 @@ -package weaver.interfaces.mq; - -import com.alibaba.fastjson.JSONArray; -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 weaver.interfaces.comInfo.PropBean; - -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; - -public class RocketmqUtil { - private Lock lock = new ReentrantLock(); - public int updateOrgData(String data) - { - BaseBean bb = new BaseBean(); - int errcount = 0; - try{ - lock.lock(); - JSONObject jsonObject = JSONObject.parseObject(data); - if(jsonObject.containsKey("requestObject")) - { - JSONArray requestArray = jsonObject.getJSONArray("requestObject"); - 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)) - { - 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); - } - } - } - -// {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode": -// "70300100030001","requestObject":[{"content":[{ -// "updateDate":"2022-07-22 11:05:22","orgName":"testOrg722","parentOrgCode":"LNP000001", -// "regionNbr":"TST_PR_CSS","orgLevel":"2","statusCd":"1000", -// "parentOrgName":"Vivia","orgId":"17012", -// "createStaff":"1","orgType":"1000", -// "regionId":"36","parentOrgId":"1", -// "orgCode":"testOrg722", -// "pathCode":"-1.1.17012","actType":"A","partyId":"0", -// "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){ - 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); - } - } - } - -// {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"},"svcCode": -// "70300100030001","requestObject":[{"content":[{"sysUserRoleId":"23444","updateDate":"2022-07-22 11:08:33", -// "systemInfoCode":"TYMH","sysRoleId":"17013","statusCd":"1000", -// "systemInfoId":"727001","operType":"1000", -// "systemUserCode":"finaceManager", -// "expDate":"2120-01-01 00:00:00","orgId":"17012", -// "createStaff":"1","effDate":"2022-07-21 10:17:51", -// "systemUserName":"financeManager", -// "orgCode":"testOrg722","roleCode":"orgManager","manageClass":"1000","roleName":"orgManager", -// "actType":"A","sysUserId":"20047","createDate":"2022-07-22 11:08:33"}], -// "tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} - - // {"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", -// "effDate":"2022-07-25 13:59:59","systemUserName":"testQian722","orgCode":"2","roleCode":"testQian722", -// "manageClass":"1000","roleName":"testQian722","actType":"D","sysUserId":"20055", -// "createDate":"2022-07-25 15:43:24","updateStaff":"1"}],"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", -// "requestObject":[{"content":[{"sysUserRoleId":"32411","updateDate":"2022-10-24 19:10:40", -// "systemInfoCode":"TYMH","hisId":"30145","sysRoleId":"23005", -// "statusCd":"1100","hasUserRole":false,"systemInfoId":"727001", -// "systemUserCode":"weaver44","expDate":"2120-01-01 00:00:00","orgId":"17012","createStaff":"1", -// "effDate":"2022-10-24 19:10:11","systemUserName":"weaver44", -// "orgCode":"testOrg722","roleCode":"TestRole02","manageClass":"1000", -// "roleName":"TestRole02","actType":"D","sysUserId":"28025","createDate":"2022-10-24 19:10:19", -// "updateStaff":"1"}],"tableName":"system_user_role","primaryKey":"sysUserRoleId"}],"key":"svcCont"} - - /*** - * - * @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++) - { - 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(" ", ""); - String roleName = Util.null2String(jsonObject.get("roleName")); - - String systemUserCode = Util.null2String(jsonObject.get("systemUserCode")); - String systemUserName = Util.null2String(jsonObject.get("systemUserName")); - - String actType = Util.null2String(jsonObject.get("actType")); - String statusCd = Util.null2String(jsonObject.get("statusCd")); - bb.writeLog("statusCd:" + statusCd + " actType:" + actType); - - try { - - String userId = ""; - String roleId = ""; - - 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")); - } - } - - if(StringUtils.isNotEmpty(roleCode)) { - - 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)) { - //查看是否已存在角色用户关系 - String releationId = ""; - String ifExistSql = "select id from hrmrolemembers where roleid=? and resourceid=?"; - 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)) { - String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - 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)) { - String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; - boolean flag = rs.executeUpdate(insertHrmrolemembersSql, new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()}); - bb.writeLog("insertHrmrolemembersSql : " + flag); - if (!flag) { - Map 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); - } - } - } - } - - - //{"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", -// "staffCode":"testQian722","orgName":"Default Branch 1","sysPostId":"18007","hisId":"322425", -// "statusCd":"1100","systemInfoId":"727001","systemUserCode":"testQian722","createStaff":"1", -// "postCode":"testXiao","staffId":22021,"updateStaff":"1"}],"tableName":"system_user_post", -// "primaryKey":"sysUserPostId"}],"key":"svcCont"} - - /*** - * - * @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 postCode = Util.null2String(jsonObject.get("postCode")); - String systemUserCode = Util.null2String(jsonObject.get("systemUserCode")); - 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(StringUtils.isEmpty(updateStaff)){ - updateStaff = "1"; - } - - String userId = ""; - String jobtitlesId = ""; - String departmentId = ""; - - 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")); - } - } - 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("jobtitlesId:"+jobtitlesId); - - if(StringUtils.isNotEmpty(jobtitlesId) && StringUtils.isNotEmpty(userId)) - { - 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,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); - } - } - } - -// {"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", -// "sysRoleName":"weaver role","statusCd":"1000","systemInfoId":"727001","sysRoleCode":"weaver role", -// "createStaff":"1","regionId":"36","sysRoleType":"1000","actType":"A","createDate":"2022-08-09 10:24:01"}], -// "tableName":"system_roles","primaryKey":"sysRoleId"}],"key":"svcCont"} - - -// {"updateDate":"2022-08-09 10:24:01", -// "systemInfoCode":"TYMH","regionNbr":"TST_PR_CSS","sysRoleId":"17020", -// "sysRoleName":"weaver role","statusCd":"1000","systemInfoId":"727001","sysRoleCode":"weaver role", -// "createStaff":"1","regionId":"36","sysRoleType":"1000","actType":"A","createDate":"2022-08-09 10:24:01"} - -// {"authenticationInfo":{"sysUserPostId":"37484","sysUserId":"1","key":"authenticationInfo"}, -// "svcCode":"70300100030001","requestObject":[{"content":[{"updateDate":"2022-07-27 11:04:19","systemInfoCode": -// "TYMH","regionNbr":"TST_PR_CSS","sysRoleId":"17016","sysRoleName":"role727", -// "statusCd":"1000","sysRoleDesc":"test727","systemInfoId":"727001","sysRoleCode":"role727", -// "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 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")); - - - bb.writeLog("sysRoleName:"+sysRoleName); - bb.writeLog("sysRoleCode:"+sysRoleCode); - -// String rolesmark = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`~" ; -// String rolesname = "~`~`7 "+sysRoleName+"`~`8 "+sysRoleName+"`~`~" ; - - String rolesmark = sysRoleName ; - String rolesname = sysRoleName ; - - bb.writeLog("rolesmark:"+rolesmark); - bb.writeLog("rolesname:"+rolesname); - - String systemInfoCode = Util.null2String(jsonObject.get("systemInfoCode")); - if("PC_OA".equalsIgnoreCase(systemInfoCode)){ - String uuid = UUID.randomUUID().toString(); - String 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"); - } - } - 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); - } - } - } - } - - - //{"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", -// "orgName":"Default Company","regionNbr":"1","initFlag":"0", -// "sysPostId":"6006","statusCd":"1000","systemInfoId":"727001", -// "sysPostType":"1000","orgId":"1","createStaff":"1","regionId":"731","orgCode":"1", -// "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() ; - - for (int i = 0; i < jsonArray.size(); i++) - { - JSONObject jsonObject = jsonArray.getJSONObject(i); - //系统岗位编码 - String sysPostType = Util.null2String(jsonObject.get("sysPostType")); - if("1300".equals(sysPostType)) - { - String sysPostCode = Util.null2String(jsonObject.get("sysPostCode")); - //系统岗位名称 - String sysPostName = Util.null2String(jsonObject.get("sysPostName")); - //部门编码 - String orgCode = Util.null2String(jsonObject.get("orgCode")); - //系统岗位状态1000 有效 1100 无效 - String statusCd = Util.null2String(jsonObject.get("statusCd")); - //修改时间 - String updateDate = Util.null2String(jsonObject.get("updateDate")); - //修改人 - String updateStaff = Util.null2String(jsonObject.get("updateStaff")); - //创建时间 - String createDate = Util.null2String(jsonObject.get("createDate")); - //创建人 - String createStaff = Util.null2String(jsonObject.get("createStaff")); - //A:新增，M:修改 - String actType = Util.null2String(jsonObject.get("actType")); - - //String allname = "~`~`7 " + sysPostName + "`~`8 " + sysPostName + "`~`~"; - - String jobtitlemark = sysPostName; - String jobtitlename = sysPostName; - - 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 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")); - } - - 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 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, 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{ - 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); - - } - } - } - } - - - // {"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 void updateStaffData(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 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); - - 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("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); - } - } - } - - - /*** - * - */ - 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/HttpUtils.java b/src/weaver/interfaces/util/HttpUtils.java index ec83fb81..43847635 100644 --- a/src/weaver/interfaces/util/HttpUtils.java +++ b/src/weaver/interfaces/util/HttpUtils.java @@ -1,27 +1,25 @@ package weaver.interfaces.util; +import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import info.monitorenter.util.Entry; -import lombok.extern.slf4j.Slf4j; +import okhttp3.*; import org.apache.commons.collections.MapUtils; -import org.apache.commons.httpclient.HttpStatus; -import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.StatusLine; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.apache.http.conn.ssl.NoopHostnameVerifier; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.springframework.util.Assert; import java.io.IOException; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.Iterator; import java.util.Map; @@ -36,10 +34,40 @@ public class HttpUtils { public static final Gson gson = new Gson(); + /** + * 单点登录获取token工具类（常用工具类会有问题） + * + * @param url + * @param paramMap + * @param headers + * @return + */ + public static String ssoLoginDoPost(String url, Map paramMap) { + OkHttpClient client = new OkHttpClient().newBuilder() + .build(); + MediaType mediaType = MediaType.parse("application/json"); + RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(paramMap)); + Request request = new Request.Builder() + .url(url) + .method("POST", body) + .addHeader("Content-Type", "application/json") + .build(); + try { + Response response = client.newCall(request).execute(); + return response.body().string(); + } catch (Exception e) { + throw new RuntimeException("Exception occurred when send ssoLoginDoPost get token" + url + "]!" + e.getMessage()); + } + } + public static String doPost(String url, Map paramMap, Map headers) { Assert.hasText(url, "Url is empty!"); - CloseableHttpClient httpClient = HttpClients.createDefault(); + CloseableHttpClient httpClient = null; try { + SSLConnectionSocketFactory scsf = new SSLConnectionSocketFactory( + SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build(), + NoopHostnameVerifier.INSTANCE); + httpClient = HttpClients.custom().setSSLSocketFactory(scsf).build(); HttpPost httpPost = new HttpPost(url); if (MapUtils.isNotEmpty(paramMap)) { StringEntity entity = new StringEntity(gson.toJson(paramMap), "UTF-8"); @@ -59,13 +87,14 @@ public class HttpUtils { return result; } catch (Exception e) { - throw new RuntimeException("Exception occurred when send post request[url:" + url - + ",paramMap:" + paramMap + "]!", e); + throw new RuntimeException("Exception occurred when send post request[url:" + url + "]!" + e.getMessage()); } finally { - try { - httpClient.close(); - } catch (Exception e) { - //np + if (httpClient != null) { + try { + httpClient.close(); + } catch (IOException e) { + throw new RuntimeException("Exception occurred when httpClient:" + e.getMessage()); + } } } } diff --git a/src/weaver/interfaces/util/HttpUtils2.java b/src/weaver/interfaces/util/HttpUtils2.java new file mode 100644 index 00000000..e86473c1 --- /dev/null +++ b/src/weaver/interfaces/util/HttpUtils2.java @@ -0,0 +1,148 @@ +package weaver.interfaces.util; + +/** + * @version 1.0 + * @Title ecology-9 + * @Company 泛微软件 + * @CreateDate 2022/11/16 + * @Description ${description} + * @Author Lee + */ + +import com.alibaba.fastjson.JSONObject; +import com.customization.sendtodo.HttpRequestUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.conn.ConnectTimeoutException; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; + +import java.io.*; +import java.net.*; +import java.util.HashMap; +import java.util.Map; + +public class HttpUtils2 { + + public static void main(String[] args) throws IOException { + HashMap requestMap = new HashMap<>(); + requestMap.put("appKey", "2022111517310001-0m7929Wan81B7"); + requestMap.put("appSecret", "f2blp7rpMb1iZbeb7Xv3eu6TtxbACW"); +// requestMap.put("appKey", "D20220926160400001-4t08Rhu3l94"); +// requestMap.put("appSecret", "080Jc0z4Bi0afVv93802e8UmHR2lVq"); +// JSONObject jsonObject = new JSONObject(requestMap); +// String jsonString = JSONObject.toJSONString(requestMap); +// System.out.println(jsonString); + + String s = HttpUtils.ssoLoginDoPost("https://sapp-test-idito.dito.ph:30443/open-apis/auth/v1/oauth/app_access_token", requestMap); +// String s = HttpUtils.ssoLoginDoPost("http://10.10.178.100/open-apis/auth/v1/oauth/app_access_token", requestMap); + System.out.println(s); +// String s = HttpRequestUtil.doPostByAuth("https://10.10.178.100/open-apis/auth/v1/oauth/app_access_token", jsonObject.toString(), null); +// System.out.println(s); + } + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String doGet(String url, String param) { + StringBuilder result = new StringBuilder(); + BufferedReader in = null; + String urlNameString = url; + try { + if (param != null || param != "") { + urlNameString = urlNameString + "?" + param; + } + URL realUrl = new URL(urlNameString); + URLConnection connection = realUrl.openConnection(); + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.connect(); + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result.append(line); + } + } catch (ConnectException e) { + e.printStackTrace(); + } catch (SocketTimeoutException | ConnectTimeoutException e) { + e.printStackTrace(); + //SocketTimeoutException：是Java包下抛出的异常，这定义了Socket读数据的超时时间，即从server获取响应数据须要等待的时间；当读取或者接收Socket超时会抛出SocketTimeoutException + System.out.println("sendGet SocketTimeoutException, url=" + url + ",param=" + param); + } catch (IOException e) { + e.printStackTrace(); + System.out.println("sendGet IOException, url=" + url + ",param=" + param); + } catch (Exception e) { + e.printStackTrace(); + System.out.println("sendGet Exception, url=" + url + ",param=" + param); + } finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception ex) { + ex.printStackTrace(); + System.out.println("sendGet Exception, url=" + url + ",param=" + param); + } + } + return result.toString(); + } + + + /** + * post请求 + * + * @param path url地址 + * @param Info jsonobject 参数 + * @return + * @throws IOException + */ + public static String doPost(String path, JSONObject Info, Map headers) throws IOException { + HttpClient client = new DefaultHttpClient(); + HttpPost post = new HttpPost(path); + + post.setHeader("Content-Type", "application/json"); + if (MapUtils.isNotEmpty(headers)) { + for (String key : headers.keySet()) { + post.addHeader(key, headers.get(key)); + } + } + String result = ""; + + try { + StringEntity s = new StringEntity(Info.toString(), "utf-8"); + s.setContentEncoding("application/json"); + post.setEntity(s); + + // 发送请求 + HttpResponse httpResponse = client.execute(post); + + // 获取响应输入流 + InputStream inStream = httpResponse.getEntity().getContent(); + BufferedReader reader = new BufferedReader(new InputStreamReader(inStream, "utf-8")); + StringBuilder strber = new StringBuilder(); + String line = null; + while ((line = reader.readLine()) != null) { + strber.append(line + "\n"); + } + inStream.close(); + + result = strber.toString(); + + + } catch (Exception e) { + System.out.println("请求异常"); + throw new RuntimeException(e); + } + + return result; + } +}