From ea4b8703b0b14110d9be12a655670a6b5078a5a4 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Wed, 8 Nov 2023 09:40:28 +0800 Subject: [PATCH] =?UTF-8?q?#EC=5FHJ120#=20MQ=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/dito/mq/HrmRocketmqUtil.java | 23 ++++++---- .../interfaces/dito/mq/RocketmqUtil.java | 43 ++++++++++++------- 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java index 5220de84..6341ab26 100644 --- a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java @@ -30,7 +30,7 @@ public class HrmRocketmqUtil { try{ RecordSet rs = new RecordSet(); - String cus_staff = PropBean.getUfPropValue("cus_staff") ; + String cus_eid = PropBean.getUfPropValue("cus_eid") ; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); String nowDateTime = sdf.format(new Date()); @@ -42,7 +42,7 @@ public class HrmRocketmqUtil { JSONObject masterInfoObject = jsonObject.getJSONObject("masterInfo"); bb.writeLog("updateOrgData---masterInfoObject:"+masterInfoObject.toJSONString()); if(masterInfoObject.containsKey("datas")){ - JSONArray datasArray = jsonObject.getJSONArray("datas"); + JSONArray datasArray = masterInfoObject.getJSONArray("datas"); for(int i=0;i dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqmessage",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数personno、managerno在cus_fielddata查询为空"); recordErrorData(dataMap); @@ -104,7 +105,7 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqmessage",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数personno、managerno未空"); recordErrorData(dataMap); @@ -114,7 +115,7 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqmessage",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数status不为1"); recordErrorData(dataMap); @@ -125,7 +126,7 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqmessage",masterInfoObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数缺少datas"); recordErrorData(dataMap); @@ -153,7 +154,7 @@ public class HrmRocketmqUtil { */ public void recordErrorData(Map dataMap){ - String uftable = "uf_orgmq" ; + String uftable = "uf_managermq" ; RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); ModeRightInfo mode=new ModeRightInfo(); @@ -182,6 +183,10 @@ public class HrmRocketmqUtil { String errmessage = Util.null2String(dataMap.get("errmessage")); String systable = Util.null2String(dataMap.get("systable")); + if(!reqmessage.contains("\\\"")){ + reqmessage = reqmessage.replace("\"","\\\""); + } + int bool = 0; sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + " values(?,?,?,?,?,?,?,?,?,?)" ; diff --git a/src/weaver/interfaces/dito/mq/RocketmqUtil.java b/src/weaver/interfaces/dito/mq/RocketmqUtil.java index 194f18ad..41170b79 100644 --- a/src/weaver/interfaces/dito/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/RocketmqUtil.java @@ -172,27 +172,38 @@ public class RocketmqUtil { bb.writeLog("currentDate:"+currentDate); String loginid = ""; - String sql = " select loginid from hrmresource where workcode=?" ; + String user_status = "" ; + String sql = " select loginid,status from hrmresource where workcode=?" ; bb.writeLog("sql:"+sql); bb.writeLog("staffCode:"+staffCode); rs.executeQuery(sql,new Object[]{staffCode}); if(rs.next()){ loginid = Util.null2String(rs.getString("loginid")); + user_status = Util.null2String(rs.getString("user_status")); } + bb.writeLog("user_status2:"+user_status); + bb.writeLog("statusCd2:"+statusCd); // String lastname = "~`~`7 "+staffName+"`~`8 "+staffName+"`~`~"; String lastname = staffName ; - bb.writeLog("loginid:"+loginid); + bb.writeLog("loginid2:"+loginid); if(StringUtils.isNotEmpty(deptId)) { if(StringUtils.isNotEmpty(loginid)) { if("M".equalsIgnoreCase(actType)) { + if("1000".equals(statusCd)){ + status = "1"; + }else if("1100".equals(statusCd) || "1200".equals(statusCd) || "1300".equals(statusCd)){ + status = "5"; + } + bb.writeLog("status2:"+status); + String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," + " creater=?,email=?,mobile=?,jobtitle=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; - bb.writeLog("userUpdateSql:"+userUpdateSql); + bb.writeLog("updateSysUserData-userUpdateSql:"+userUpdateSql); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email, pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode}); @@ -1168,18 +1179,23 @@ public class RocketmqUtil { String staffName = Util.null2String(jsonObject.get("staffName")); String staffCode = Util.null2String(jsonObject.get("staffCode")); + bb.writeLog("staffCode:"+staffCode); String actType = Util.null2String(jsonObject.get("actType")); String email = "" ; if(jsonObject.containsKey("eMail")){ - email = Util.null2String(jsonObject.get("eMail")); + email = Util.null2String(jsonObject.getString("eMail"),"null"); }else if(jsonObject.containsKey("email")){ - email = Util.null2String(jsonObject.get("email")); + email = Util.null2String(jsonObject.getString("email"),"null"); } + bb.writeLog("email:"+email); - String pwdSmsTel = Util.null2String(jsonObject.get("pwdSmsTel")); + String pwdSmsTel = Util.null2String(jsonObject.getString("pwdSmsTel"),"null"); + bb.writeLog("pwdSmsTel:"+pwdSmsTel); + String loginedNum = Util.null2String(jsonObject.getString("sysUserId"),"null"); + bb.writeLog("loginedNum:"+loginedNum); - String loginedNum = Util.null2String(jsonObject.get("sysUserId")); String statusCd = Util.null2String(jsonObject.get("statusCd")); + bb.writeLog("statusCd:"+statusCd); String staffType = Util.null2String(jsonObject.get("staffType")); String status = "1"; // String lastname = " ~`~`7 "+staffName+"`~`8 "+staffName+"`~`~"; @@ -1223,7 +1239,7 @@ public class RocketmqUtil { } } - + bb.writeLog("user_status:"+user_status); bb.writeLog("loginid:"+loginid); if(StringUtils.isNotEmpty(deptId)) { @@ -1232,18 +1248,15 @@ public class RocketmqUtil { if("M".equalsIgnoreCase(actType)) { if("1000".equals(statusCd)){ - if("5".equals(user_status)){ - status = "1"; - } + status = "1"; }else if("1100".equals(statusCd)){ - if("1".equals(user_status)){ - status = "5"; - } + status = "5"; } + bb.writeLog("status:"+status); String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," + " creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; - bb.writeLog("userUpdateSql:"+userUpdateSql); + bb.writeLog("updateSysUserData-userUpdateSql:"+userUpdateSql); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,status,loginedNum,currentDate,currentDateTime,staffCode}); bb.writeLog("flag:"+flag); Map dataMap = new HashMap();