From c9235c80388197b87aadafe22cd1a785f5101f5b Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Mon, 16 Dec 2024 14:26:39 +0800 Subject: [PATCH] log --- .../interfaces/eipoa/GetSystemList.java | 2 + .../workflow/action/ChangeOrgRoleAction.java | 220 +++++++------- .../workflow/action/CheckEmailAction.java | 5 +- .../workflow/action/CheckSystemAction.java | 5 +- .../workflow/action/CloseAccountAction.java | 1 + .../workflow/action/DidiYongCheAction.java | 275 +++++++++--------- .../workflow/action/ZITF_OA_DELETE.java | 2 + 7 files changed, 263 insertions(+), 247 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java index b2b8d42..c8560cc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/GetSystemList.java @@ -16,7 +16,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; +@Component public class GetSystemList extends BaseBean { private static final Logger logger_a4ce8d9d = LoggerFactory.getLogger(GetSystemList.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java index ccf19b8..4f22a22 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java @@ -1,112 +1,114 @@ -//package com.weaver.seconddev.interfaces.workflow.action; -// -//import java.util.HashMap; -//import java.util.Map; +package com.weaver.seconddev.interfaces.workflow.action; + +import java.util.HashMap; +import java.util.Map; //import weaver.matrix.MatrixUtil; -//import com.weaver.common.i18n.tool.util.I18nContextUtil; -//import com.weaver.verupgrade.conn.CONN_TYPE; -//import java.lang.*; -//import com.weaver.verupgrade.workflow.request.RequestManager; -//import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; -//import com.weaver.common.base.entity.result.WeaResult; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.weaver.verupgrade.soa.workflow.request.RequestInfo; -//import com.weaver.verupgrade.conn.RecordSet; -//import com.weaver.verupgrade.general.BaseBean; -//import com.weaver.verupgrade.general.Util; -//import com.weaver.verupgrade.hrm.company.DepartmentComInfo; -//import com.weaver.verupgrade.hrm.company.SubCompanyComInfo; -//import com.weaver.verupgrade.hrm.resource.ResourceComInfo; -//import com.weaver.verupgrade.soa.workflow.request.Property; -//import com.weaver.verupgrade.interfaces.workflow.action.Action; -// -//@org.springframework.stereotype.Service("workflow_action_ChangeOrgRoleAction") -//public class ChangeOrgRoleAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { -// -// // 对应E9的请求信息对象 -// @Autowired -// private RequestInfo requestInfoTemp; -// -// private static final Logger logger_c08ea2e1 = LoggerFactory.getLogger(ChangeOrgRoleAction.class); -// -// public WeaResult> execute(Map requestInfoMap) { -// Map weaverResultMap = new HashMap<>(); -// Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); -// Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); -// RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); -// try { -// String requestid = request.getRequestid(); -// try { -// logger_c08ea2e1.info(String.valueOf(requestid + "开始修改组织架构权限")); -// Property[] properties = request.getMainTableInfo().getProperty(); -// Map map = new HashMap(); -// for (int i = 0; i < properties.length; i++) { -// String name = properties[i].getName().toUpperCase(); -// String value = Util.null2String(properties[i].getValue()); -// map.put(name, value); -// } -// String org = ""; -// String role = ""; -// String sql = ""; -// String resorceid = map.get("XJSYY"); -// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); -// if ("0".equals(map.get("ZZJGGG"))) { -// org = map.get("XTZGS"); -// role = map.get("XTZFBJS"); -// role = role.substring(role.indexOf("_") + 1); -// sql = "update formdata_detail as HrmSubcompanyDefined set " + role + "='" + resorceid + "' where subcomid=" + org; -// String poolname_i8 = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql(sql, poolname_i8); -// SubCompanyComInfo subCompanyComInfo = I18nContextUtil.getBean(SubCompanyComInfo.class); -// subCompanyComInfo.removeCompanyCache(); -// String poolname_v1 = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0 AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_v1); +import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.verupgrade.conn.CONN_TYPE; +import java.lang.*; +import com.weaver.verupgrade.workflow.request.RequestManager; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.common.base.entity.result.WeaResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import com.weaver.verupgrade.soa.workflow.request.RequestInfo; +import com.weaver.verupgrade.conn.RecordSet; +import com.weaver.verupgrade.general.BaseBean; +import com.weaver.verupgrade.general.Util; +import com.weaver.verupgrade.hrm.company.DepartmentComInfo; +import com.weaver.verupgrade.hrm.company.SubCompanyComInfo; +import com.weaver.verupgrade.hrm.resource.ResourceComInfo; +import com.weaver.verupgrade.soa.workflow.request.Property; +import com.weaver.verupgrade.interfaces.workflow.action.Action; + +@org.springframework.stereotype.Service("workflow_action_ChangeOrgRoleAction") +public class ChangeOrgRoleAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { + + // 对应E9的请求信息对象 + @Autowired + private RequestInfo requestInfoTemp; + + private static final Logger logger_c08ea2e1 = LoggerFactory.getLogger(ChangeOrgRoleAction.class); + + public WeaResult> execute(Map requestInfoMap) { + Map weaverResultMap = new HashMap<>(); + Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); + Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); + RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + try { + String requestid = request.getRequestid(); + try { + logger_c08ea2e1.info(String.valueOf(requestid + "开始修改组织架构权限")); + Property[] properties = request.getMainTableInfo().getProperty(); + Map map = new HashMap(); + for (int i = 0; i < properties.length; i++) { + String name = properties[i].getName().toUpperCase(); + String value = Util.null2String(properties[i].getValue()); + map.put(name, value); + } + String org = ""; + String role = ""; + String sql = ""; + String resorceid = map.get("XJSYY"); + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + if ("0".equals(map.get("ZZJGGG"))) { + org = map.get("XTZGS"); + role = map.get("XTZFBJS"); + role = role.substring(role.indexOf("_") + 1); + sql = "update formdata_detail as HrmSubcompanyDefined set " + role + "='" + resorceid + "' where subcomid=" + org; + String poolname_i8 = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql(sql, poolname_i8); + SubCompanyComInfo subCompanyComInfo = I18nContextUtil.getBean(SubCompanyComInfo.class); + subCompanyComInfo.removeCompanyCache(); + String poolname_v1 = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0 AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_v1); + //TODO config // MatrixUtil.updateSubcompayData(org); -// } else if ("1".equals(map.get("ZZJGGG"))) { -// org = map.get("XTZBM"); -// role = map.get("XTZBMJS"); -// role = role.substring(role.indexOf("_") + 1); -// sql = "update HrmDepartmentDefined set " + role + "='" + resorceid + "' where deptid=" + org; -// String poolname = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql(sql, poolname); -// DepartmentComInfo departmentComInfo = I18nContextUtil.getBean(DepartmentComInfo.class); -// departmentComInfo.removeCompanyCache(); -// ResourceComInfo ResourceComInfo = I18nContextUtil.getBean(ResourceComInfo.class); -// ResourceComInfo.removeResourceCache(); -// String poolname_ou = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0 AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_ou); + } else if ("1".equals(map.get("ZZJGGG"))) { + org = map.get("XTZBM"); + role = map.get("XTZBMJS"); + role = role.substring(role.indexOf("_") + 1); + sql = "update HrmDepartmentDefined set " + role + "='" + resorceid + "' where deptid=" + org; + String poolname = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql(sql, poolname); + DepartmentComInfo departmentComInfo = I18nContextUtil.getBean(DepartmentComInfo.class); + departmentComInfo.removeCompanyCache(); + ResourceComInfo ResourceComInfo = I18nContextUtil.getBean(ResourceComInfo.class); + ResourceComInfo.removeResourceCache(); + String poolname_ou = CONN_TYPE.workflow.getType(); + // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0 AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_ou); + //TODO config // MatrixUtil.updateDepartmentData(org); -// } -// logger_c08ea2e1.info(String.valueOf(requestid + "修改组织架构权限结束")); -// } catch (Exception e) { -// logger_c08ea2e1.info(String.valueOf(requestid + "修改组织架构权限出错：" + e.toString())); -// } -// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); -// } catch (Exception e) { -// e.printStackTrace(); -// logger_c08ea2e1.error("ChangeOrgRoleAction e: {}", e.getMessage()); -// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), request.getRequestManager())); -// } -// } -// -// Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { -// if (key != null && !key.isEmpty()) { -// map.put(key, value); -// } -// String msgContent = requestManager.getMessagecontent(); -// if (msgContent != null && !msgContent.isEmpty()) { -// map.put("msgContent", msgContent); -// } -// String msgId = requestManager.getMessageid(); -// if (msgId != null && !msgId.isEmpty()) { -// map.put("msgId", msgId); -// } -// return map; -// } -//} + } + logger_c08ea2e1.info(String.valueOf(requestid + "修改组织架构权限结束")); + } catch (Exception e) { + logger_c08ea2e1.info(String.valueOf(requestid + "修改组织架构权限出错：" + e.toString())); + } + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); + } catch (Exception e) { + e.printStackTrace(); + logger_c08ea2e1.error("ChangeOrgRoleAction e: {}", e.getMessage()); + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager())); + } + } + + Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { + if (key != null && !key.isEmpty()) { + map.put(key, value); + } + String msgContent = requestManager.getMessagecontent(); + if (msgContent != null && !msgContent.isEmpty()) { + map.put("msgContent", msgContent); + } + String msgId = requestManager.getMessageid(); + if (msgId != null && !msgId.isEmpty()) { + map.put("msgId", msgId); + } + return map; + } +} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java index 4261e5c..b04bd08 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckEmailAction.java @@ -41,12 +41,15 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR @Autowired private ConfigProp configProp; + @Autowired + private GetSystemList sys; public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_48219209.info("CheckEmailAction start "); try { Socket socket = null; IClient client = null; @@ -120,7 +123,7 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("此流程已有未归档的申请，待归档后才能再次申请。"); } - GetSystemList sys = new GetSystemList(); +// GetSystemList sys = new GetSystemList(); String result = sys.getList(yhgh); logger_48219209.info(String.valueOf("调用门户查询已开户系统接口返回值：" + result)); if (!"E".equals(result)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java index 69dfdf2..22f34a9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java @@ -33,12 +33,15 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless public CheckSystemAction() { } + @Autowired + private GetSystemList sys; public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_b4155f0e.info("CheckSystemAction start"); try { try { BillFieldUtil unit = new BillFieldUtil(); @@ -81,7 +84,7 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("此流程已有未归档的申请，待归档后才能再次申请。"); } - GetSystemList sys = new GetSystemList(); +// GetSystemList sys = new GetSystemList(); String result = sys.getList(yhgh); logger_b4155f0e.info(String.valueOf("调用门户查询已开户系统接口返回值：" + result)); if (!"E".equals(result)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CloseAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CloseAccountAction.java index 5835da3..6697c33 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CloseAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CloseAccountAction.java @@ -44,6 +44,7 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_ac56032a.info("CloseAccountAction start"); try { String requestId = request.getRequestid(); String wfid = request.getWorkflowid(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java index 11ab111..b974c06 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java @@ -1,143 +1,146 @@ -//package com.weaver.seconddev.interfaces.workflow.action; -// -//import com.alibaba.fastjson.JSONObject; +package com.weaver.seconddev.interfaces.workflow.action; + +import com.alibaba.fastjson.JSONObject; //import com.cloudstore.dev.api.bean.MessageBean; //import com.cloudstore.dev.api.bean.MessageType; //import com.cloudstore.dev.api.util.Util_Message; -//import com.weaver.seconddev.interfaces.eipoa.DidiApprovalOperate; -//import java.util.*; -//import com.weaver.common.i18n.tool.util.I18nContextUtil; -//import java.lang.*; -//import com.weaver.verupgrade.workflow.request.RequestManager; -//import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; -//import com.weaver.common.base.entity.result.WeaResult; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.weaver.verupgrade.soa.workflow.request.RequestInfo; -//import java.util.Map; -//import java.util.HashMap; -//import com.weaver.verupgrade.general.BaseBean; -//import com.weaver.verupgrade.general.Util; -//import com.weaver.verupgrade.hrm.company.DepartmentComInfo; -//import com.weaver.verupgrade.soa.workflow.request.Property; -//import com.weaver.verupgrade.interfaces.workflow.action.Action; -// -//@org.springframework.stereotype.Service("workflow_action_DidiYongCheAction") -//public class DidiYongCheAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { -// -// // 对应E9的请求信息对象 -// @Autowired -// private RequestInfo requestInfoTemp; -// -// private static final Logger logger_3ff37d5e = LoggerFactory.getLogger(DidiYongCheAction.class); -// -// @Override -// public WeaResult> execute(Map requestInfoMap) { -// Map weaverResultMap = new HashMap<>(); -// Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); -// Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); -// RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); -// try { -// String requestid = requestinfo.getRequestid(); -// logger_3ff37d5e.info(String.valueOf("DidiYongCheAction-start:" + requestid)); -// try { -// Map map = new HashMap(); -// Property[] properties = requestinfo.getMainTableInfo().getProperty(); -// for (int i = 0; i < properties.length; i++) { -// String name = properties[i].getName().toUpperCase(); -// String value = Util.null2String(properties[i].getValue()); -// map.put(name, value); -// } -// if ("1".equals(map.get("PCFS"))) { -// // 用车人 -// String ycr = map.get("SQR"); -// // 乘车人 -// String ccr = map.get("CCRY"); -// // 费用结算部门 -// String bm = map.get("SQBM"); -// DepartmentComInfo dept = I18nContextUtil.getBean(DepartmentComInfo.class); -// List sendlist = new ArrayList(); -// sendlist.add(ycr); -// String spdlx = map.get("SPDLX"); -// String ruleId = getPropValue("htportaloaUrl", "didiRuleId_" + map.get("YCZD")); -// String startTime = map.get("DDKSRQ") + " 00:00:00"; -// String endTime = map.get("DDJSRQ") + " 23:59:59"; -// int tripTimes = 0; -// JSONObject object = new JSONObject(); -// object.put("uid", map.get("SQRGH")); -// object.put("phone", map.get("SQRYLXDH")); -// object.put("ruleId", ruleId); -// object.put("requestId", requestid); -// object.put("approveType", Integer.parseInt(spdlx) + 1 + ""); -// object.put("reason", map.get("SQSY")); -// object.put("startTime", startTime); -// object.put("endTime", endTime); -// object.put("deptGuid", dept.getDepartmentCode(bm)); -// if ("1".equals(spdlx)) { -// tripTimes = Integer.parseInt(map.get("TRIPTIMES")); -// if (tripTimes == 0) { -// requestinfo.getRequestManager().setMessageid("ERROR"); -// requestinfo.getRequestManager().setMessagecontent("商务出行按次数，次数需大于0！"); -// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); -// } -// object.put("tripTimes", tripTimes); -// } -// DidiApprovalOperate operate = new DidiApprovalOperate(); -// String result = operate.operteAppr(object, "didicreate"); -// logger_3ff37d5e.info(String.valueOf(requestid + "-DidiYongCheAction-result:" + result)); -// if (!"E".equals(result)) { -// JSONObject jsonObject = JSONObject.parseObject(result); -// String flag = jsonObject.getString("success"); -// String message = jsonObject.getString("message"); -// if (!flag.equals("true")) { -// requestinfo.getRequestManager().setMessageid("ERROR"); -// requestinfo.getRequestManager().setMessagecontent("滴滴返回错误信息：" + message); -// } else { -// String content = getPropValue("htportaloaUrl", "didiremindtext"); -// // Map urlmap = new HashMap(); -// // urlmap.put("msgurl", getPropValue("htportaloaUrl","didiremindurl")); -// String dataid = getPropValue("htportaloaUrl", "didireminddataid"); -// // InterfaceUtil.sendMsg(sendlist,","+dataid+",", "", content,16,urlmap); +import com.weaver.seconddev.interfaces.eipoa.DidiApprovalOperate; +import java.util.*; +import com.weaver.common.i18n.tool.util.I18nContextUtil; +import java.lang.*; +import com.weaver.verupgrade.workflow.request.RequestManager; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.common.base.entity.result.WeaResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import com.weaver.verupgrade.soa.workflow.request.RequestInfo; +import java.util.Map; +import java.util.HashMap; +import com.weaver.verupgrade.general.BaseBean; +import com.weaver.verupgrade.general.Util; +import com.weaver.verupgrade.hrm.company.DepartmentComInfo; +import com.weaver.verupgrade.soa.workflow.request.Property; +import com.weaver.verupgrade.interfaces.workflow.action.Action; + +@org.springframework.stereotype.Service("workflow_action_DidiYongCheAction") +public class DidiYongCheAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { + + // 对应E9的请求信息对象 + @Autowired + private RequestInfo requestInfoTemp; + + private static final Logger logger_3ff37d5e = LoggerFactory.getLogger(DidiYongCheAction.class); + + @Override + public WeaResult> execute(Map requestInfoMap) { + Map weaverResultMap = new HashMap<>(); + Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); + Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); + RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + try { + String requestid = requestinfo.getRequestid(); + logger_3ff37d5e.info(String.valueOf("DidiYongCheAction-start:" + requestid)); + try { + Map map = new HashMap(); + Property[] properties = requestinfo.getMainTableInfo().getProperty(); + for (int i = 0; i < properties.length; i++) { + String name = properties[i].getName().toUpperCase(); + String value = Util.null2String(properties[i].getValue()); + map.put(name, value); + } + if ("1".equals(map.get("PCFS"))) { + // 用车人 + String ycr = map.get("SQR"); + // 乘车人 + String ccr = map.get("CCRY"); + // 费用结算部门 + String bm = map.get("SQBM"); + DepartmentComInfo dept = I18nContextUtil.getBean(DepartmentComInfo.class); + List sendlist = new ArrayList(); + sendlist.add(ycr); + String spdlx = map.get("SPDLX"); + String ruleId = getPropValue("htportaloaUrl", "didiRuleId_" + map.get("YCZD")); + String startTime = map.get("DDKSRQ") + " 00:00:00"; + String endTime = map.get("DDJSRQ") + " 23:59:59"; + int tripTimes = 0; + JSONObject object = new JSONObject(); + object.put("uid", map.get("SQRGH")); + object.put("phone", map.get("SQRYLXDH")); + object.put("ruleId", ruleId); + object.put("requestId", requestid); + object.put("approveType", Integer.parseInt(spdlx) + 1 + ""); + object.put("reason", map.get("SQSY")); + object.put("startTime", startTime); + object.put("endTime", endTime); + object.put("deptGuid", dept.getDepartmentCode(bm)); + if ("1".equals(spdlx)) { + tripTimes = Integer.parseInt(map.get("TRIPTIMES")); + if (tripTimes == 0) { + requestinfo.getRequestManager().setMessageid("ERROR"); + requestinfo.getRequestManager().setMessagecontent("商务出行按次数，次数需大于0！"); + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); + } + object.put("tripTimes", tripTimes); + } + DidiApprovalOperate operate = new DidiApprovalOperate(); + String result = operate.operteAppr(object, "didicreate"); + logger_3ff37d5e.info(String.valueOf(requestid + "-DidiYongCheAction-result:" + result)); + if (!"E".equals(result)) { + JSONObject jsonObject = JSONObject.parseObject(result); + String flag = jsonObject.getString("success"); + String message = jsonObject.getString("message"); + if (!flag.equals("true")) { + requestinfo.getRequestManager().setMessageid("ERROR"); + requestinfo.getRequestManager().setMessagecontent("滴滴返回错误信息：" + message); + } else { + String content = getPropValue("htportaloaUrl", "didiremindtext"); + // Map urlmap = new HashMap(); + // urlmap.put("msgurl", getPropValue("htportaloaUrl","didiremindurl")); + String dataid = getPropValue("htportaloaUrl", "didireminddataid"); + // InterfaceUtil.sendMsg(sendlist,","+dataid+",", "", content,16,urlmap); + + + //TODO config // MessageType messageType = MessageType.newInstance(522); // MessageBean messageBean = Util_Message.createMessage(messageType, new HashSet(sendlist), content, content, "", getPropValue("htportaloaUrl", "didiremindurl")); // messageBean.setCreater(1); // Util_Message.store(messageBean); -// } -// } else { -// requestinfo.getRequestManager().setMessageid("ERROR"); -// requestinfo.getRequestManager().setMessagecontent("数据同步滴滴出错，请联系管理员！"); -// } -// } -// } catch (Exception e) { -// requestinfo.getRequestManager().setMessageid("ERROR"); -// requestinfo.getRequestManager().setMessagecontent("数据同步滴滴出错，请联系管理员！"); -// logger_3ff37d5e.info(String.valueOf("DidiYongCheAction出错：" + e.toString())); -// } -// logger_3ff37d5e.info(String.valueOf("DidiYongCheAction-end:" + requestid)); -// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); -// } catch (Exception e) { -// e.printStackTrace(); -// logger_3ff37d5e.error("DidiYongCheAction e: {}", e.getMessage()); -// return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestinfo.getRequestManager())); -// } -// } -// -// Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { -// if (key != null && !key.isEmpty()) { -// map.put(key, value); -// } -// String msgContent = requestManager.getMessagecontent(); -// if (msgContent != null && !msgContent.isEmpty()) { -// map.put("msgContent", msgContent); -// } -// String msgId = requestManager.getMessageid(); -// if (msgId != null && !msgId.isEmpty()) { -// map.put("msgId", msgId); -// } -// return map; -// } -// -// -// -//} + } + } else { + requestinfo.getRequestManager().setMessageid("ERROR"); + requestinfo.getRequestManager().setMessagecontent("数据同步滴滴出错，请联系管理员！"); + } + } + } catch (Exception e) { + requestinfo.getRequestManager().setMessageid("ERROR"); + requestinfo.getRequestManager().setMessagecontent("数据同步滴滴出错，请联系管理员！"); + logger_3ff37d5e.info(String.valueOf("DidiYongCheAction出错：" + e.toString())); + } + logger_3ff37d5e.info(String.valueOf("DidiYongCheAction-end:" + requestid)); + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); + } catch (Exception e) { + e.printStackTrace(); + logger_3ff37d5e.error("DidiYongCheAction e: {}", e.getMessage()); + return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager())); + } + } + + Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { + if (key != null && !key.isEmpty()) { + map.put(key, value); + } + String msgContent = requestManager.getMessagecontent(); + if (msgContent != null && !msgContent.isEmpty()) { + map.put("msgContent", msgContent); + } + String msgId = requestManager.getMessageid(); + if (msgId != null && !msgId.isEmpty()) { + map.put("msgId", msgId); + } + return map; + } + + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZITF_OA_DELETE.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZITF_OA_DELETE.java index 477c76f..3fa6c76 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZITF_OA_DELETE.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZITF_OA_DELETE.java @@ -60,6 +60,7 @@ public class ZITF_OA_DELETE implements Action, EsbServerlessRpcRemoteInterface { * @return */ public String[] Getexecute(String guid, String sqlx, String hh) { + logger_89fa22b9.info("ZITF_OA_DELETE Getexecute start"); retstr = new String[2]; String functionName = ""; if ("0".equals(sqlx)) { @@ -123,6 +124,7 @@ public class ZITF_OA_DELETE implements Action, EsbServerlessRpcRemoteInterface { retstr[1] = sb.length() > 0 ? sb.toString() : "标记删除成功"; } } + return retstr; } catch (Exception exception) { retstr[0] = "E";