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

#EC_HJ120# MQ接口优化

Browse Source
main
shilei 1 year ago
parent d0ed5f8948
commit ea4b8703b0
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File

23
src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class HrmRocketmqUtil {
try{ try{
RecordSet rs = new RecordSet(); 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"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowDateTime = sdf.format(new Date()); String nowDateTime = sdf.format(new Date());
@ -42,7 +42,7 @@ public class HrmRocketmqUtil {
JSONObject masterInfoObject = jsonObject.getJSONObject("masterInfo"); JSONObject masterInfoObject = jsonObject.getJSONObject("masterInfo");
bb.writeLog("updateOrgData---masterInfoObject:"+masterInfoObject.toJSONString()); bb.writeLog("updateOrgData---masterInfoObject:"+masterInfoObject.toJSONString());
if(masterInfoObject.containsKey("datas")){ if(masterInfoObject.containsKey("datas")){
JSONArray datasArray = jsonObject.getJSONArray("datas"); JSONArray datasArray = masterInfoObject.getJSONArray("datas");
for(int i=0;i<datasArray.size();i++) for(int i=0;i<datasArray.size();i++)
{ {
JSONObject datasObject = datasArray.getJSONObject(i); JSONObject datasObject = datasArray.getJSONObject(i);
@ -59,7 +59,7 @@ public class HrmRocketmqUtil {
if(StringUtils.isNotEmpty(personno) && StringUtils.isNotEmpty(managerno)) { if(StringUtils.isNotEmpty(personno) && StringUtils.isNotEmpty(managerno)) {
String personid = "" ; String personid = "" ;
String managerid = "" ; String managerid = "" ;
String sql = "select id from cus_fielddata where "+cus_staff+" = ? and scope='HrmCustomFieldByInfoType' and scopeid=-1 " ; String sql = "select id from cus_fielddata where "+cus_eid+" = ? and scope='HrmCustomFieldByInfoType' and scopeid=-1 " ;
bb.writeLog("sql:"+sql); bb.writeLog("sql:"+sql);
rs.executeQuery(sql,new Object[]{personno}); rs.executeQuery(sql,new Object[]{personno});
if(rs.next()) { if(rs.next()) {
@ -67,7 +67,7 @@ public class HrmRocketmqUtil {
} }
bb.writeLog("personid:"+personid); bb.writeLog("personid:"+personid);
sql = "select id from cus_fielddata where "+cus_staff+" = ? and scope='HrmCustomFieldByInfoType' and scopeid=-1 " ; sql = "select id from cus_fielddata where "+cus_eid+" = ? and scope='HrmCustomFieldByInfoType' and scopeid=-1 " ;
bb.writeLog("sql:"+sql); bb.writeLog("sql:"+sql);
rs.executeQuery(sql,new Object[]{managerno}); rs.executeQuery(sql,new Object[]{managerno});
if(rs.next()) { if(rs.next()) {
@ -84,6 +84,7 @@ public class HrmRocketmqUtil {
sql = " update hrmresource h set h.managerid = ? where id = ? "; sql = " update hrmresource h set h.managerid = ? where id = ? ";
boolean flag = rs.executeUpdate(sql,new Object[]{managerid,personid}); boolean flag = rs.executeUpdate(sql,new Object[]{managerid,personid});
bb.writeLog("flag:"+flag);
if(!flag){ if(!flag){
errcount++; errcount++;
dataMap.put("errmessage","人员更新SQL执行错误,managerid:"+managerid+"、personid:"+personid); dataMap.put("errmessage","人员更新SQL执行错误,managerid:"+managerid+"、personid:"+personid);
@ -95,7 +96,7 @@ public class HrmRocketmqUtil {
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("reqmessage",datasObject.toJSONString());
dataMap.put("systable","hrmresource"); dataMap.put("systable","hrmresource");
dataMap.put("errmessage","入参参数personno、managerno在cus_fielddata查询为空"); dataMap.put("errmessage","入参参数personno、managerno在cus_fielddata查询为空");
recordErrorData(dataMap); recordErrorData(dataMap);
@ -104,7 +105,7 @@ public class HrmRocketmqUtil {
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("reqmessage",datasObject.toJSONString());
dataMap.put("systable","hrmresource"); dataMap.put("systable","hrmresource");
dataMap.put("errmessage","入参参数personno、managerno未空"); dataMap.put("errmessage","入参参数personno、managerno未空");
recordErrorData(dataMap); recordErrorData(dataMap);
@ -114,7 +115,7 @@ public class HrmRocketmqUtil {
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("reqmessage",datasObject.toJSONString());
dataMap.put("systable","hrmresource"); dataMap.put("systable","hrmresource");
dataMap.put("errmessage","入参参数status不为1"); dataMap.put("errmessage","入参参数status不为1");
recordErrorData(dataMap); recordErrorData(dataMap);
@ -125,7 +126,7 @@ public class HrmRocketmqUtil {
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("reqmessage",masterInfoObject.toJSONString());
dataMap.put("systable","hrmresource"); dataMap.put("systable","hrmresource");
dataMap.put("errmessage","入参参数缺少datas"); dataMap.put("errmessage","入参参数缺少datas");
recordErrorData(dataMap); recordErrorData(dataMap);
@ -153,7 +154,7 @@ public class HrmRocketmqUtil {
*/ */
public void recordErrorData(Map<String,String> dataMap){ public void recordErrorData(Map<String,String> dataMap){
String uftable = "uf_orgmq" ; String uftable = "uf_managermq" ;
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean(); BaseBean bb = new BaseBean();
ModeRightInfo mode=new ModeRightInfo(); ModeRightInfo mode=new ModeRightInfo();
@ -182,6 +183,10 @@ public class HrmRocketmqUtil {
String errmessage = Util.null2String(dataMap.get("errmessage")); String errmessage = Util.null2String(dataMap.get("errmessage"));
String systable = Util.null2String(dataMap.get("systable")); String systable = Util.null2String(dataMap.get("systable"));
if(!reqmessage.contains("\\\"")){
reqmessage = reqmessage.replace("\"","\\\"");
}
int bool = 0; int bool = 0;
sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" +
" values(?,?,?,?,?,?,?,?,?,?)" ; " values(?,?,?,?,?,?,?,?,?,?)" ;

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

@ -172,27 +172,38 @@ public class RocketmqUtil {
bb.writeLog("currentDate:"+currentDate); bb.writeLog("currentDate:"+currentDate);
String loginid = ""; 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("sql:"+sql);
bb.writeLog("staffCode:"+staffCode); bb.writeLog("staffCode:"+staffCode);
rs.executeQuery(sql,new Object[]{staffCode}); rs.executeQuery(sql,new Object[]{staffCode});
if(rs.next()){ if(rs.next()){
loginid = Util.null2String(rs.getString("loginid")); 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 = "~`~`7 "+staffName+"`~`8 "+staffName+"`~`~";
String lastname = staffName ; String lastname = staffName ;
bb.writeLog("loginid:"+loginid); bb.writeLog("loginid2:"+loginid);
if(StringUtils.isNotEmpty(deptId)) if(StringUtils.isNotEmpty(deptId))
{ {
if(StringUtils.isNotEmpty(loginid)) if(StringUtils.isNotEmpty(loginid))
{ {
if("M".equalsIgnoreCase(actType)) 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=?," + String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," +
" creater=?,email=?,mobile=?,jobtitle=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; " 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, boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,
pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode}); pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode});
@ -1168,18 +1179,23 @@ public class RocketmqUtil {
String staffName = Util.null2String(jsonObject.get("staffName")); String staffName = Util.null2String(jsonObject.get("staffName"));
String staffCode = Util.null2String(jsonObject.get("staffCode")); String staffCode = Util.null2String(jsonObject.get("staffCode"));
bb.writeLog("staffCode:"+staffCode);
String actType = Util.null2String(jsonObject.get("actType")); String actType = Util.null2String(jsonObject.get("actType"));
String email = "" ; String email = "" ;
if(jsonObject.containsKey("eMail")){ if(jsonObject.containsKey("eMail")){
email = Util.null2String(jsonObject.get("eMail")); email = Util.null2String(jsonObject.getString("eMail"),"null");
}else if(jsonObject.containsKey("email")){ }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")); String statusCd = Util.null2String(jsonObject.get("statusCd"));
bb.writeLog("statusCd:"+statusCd);
String staffType = Util.null2String(jsonObject.get("staffType")); String staffType = Util.null2String(jsonObject.get("staffType"));
String status = "1"; String status = "1";
// String lastname = " ~`~`7 "+staffName+"`~`8 "+staffName+"`~`~"; // String lastname = " ~`~`7 "+staffName+"`~`8 "+staffName+"`~`~";
@ -1223,7 +1239,7 @@ public class RocketmqUtil {
} }
} }
bb.writeLog("user_status:"+user_status);
bb.writeLog("loginid:"+loginid); bb.writeLog("loginid:"+loginid);
if(StringUtils.isNotEmpty(deptId)) if(StringUtils.isNotEmpty(deptId))
{ {
@ -1232,18 +1248,15 @@ public class RocketmqUtil {
if("M".equalsIgnoreCase(actType)) if("M".equalsIgnoreCase(actType))
{ {
if("1000".equals(statusCd)){ if("1000".equals(statusCd)){
if("5".equals(user_status)){
status = "1"; status = "1";
}
}else if("1100".equals(statusCd)){ }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=?," + String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," +
" creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; " 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}); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,status,loginedNum,currentDate,currentDateTime,staffCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();

Write Preview
Loading…
Cancel
Save