From 53c17efc242044238bacebdaddc549727b234725 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Wed, 25 Dec 2024 16:10:34 +0800 Subject: [PATCH] updates --- .../seconddev/interfaces/srmoa/OaSrmVenMatExtService.java | 6 +++--- .../workflow/action/OaSrmVenMatExtCheckAction.java | 2 +- .../interfaces/workflow/action/OaWmsReturnAction.java | 8 ++++++-- .../interfaces/workflow/action/OperateAccountAction.java | 8 ++++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java index 72cabea..172231f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java @@ -58,7 +58,7 @@ public class OaSrmVenMatExtService extends BaseBean { } catch (Exception e) { str[0] = "-1"; str[1] = e.toString(); - logger_333d882d.info(String.valueOf("调用SRM供应商货源关系接口开始出错：" + e.toString())); + logger_333d882d.error(String.valueOf("调用SRM供应商货源关系接口开始出错：" + e.toString())); } return str; } @@ -79,8 +79,8 @@ public class OaSrmVenMatExtService extends BaseBean { } catch (Exception e) { str[0] = "-1"; str[1] = e.toString(); - logger_333d882d.info(String.valueOf(e)); - logger_333d882d.info(String.valueOf(requestid + "调用SRM供应商货源关系接口开始出错：" + e.toString())); + logger_333d882d.error(String.valueOf(e)); + logger_333d882d.error(String.valueOf(requestid + "调用SRM供应商货源关系接口开始出错：" + e.toString())); } return str; } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtCheckAction.java index f15fbef..62ef8a4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtCheckAction.java @@ -204,7 +204,7 @@ public class OaSrmVenMatExtCheckAction extends BaseBean implements Action, EsbSe logger_ac19fc9b.info(String.valueOf(new StringBuilder().append(requestid).append("GY104调用接口校验数据完成").toString())); } } catch (Exception e) { - logger_ac19fc9b.info(String.valueOf(new StringBuilder().append(requestid).append("SRM接口返回错误信息：").append(e.toString()).toString())); + logger_ac19fc9b.error(String.valueOf(new StringBuilder().append(requestid).append("SRM接口返回错误信息：").append(e.toString()).toString())); requestinfo.getRequestManager().setMessageid("error"); requestinfo.getRequestManager().setMessagecontent(e.toString()); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java index c2c227b..1532c75 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java @@ -37,6 +37,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless private static final Logger logger_824c0f2 = LoggerFactory.getLogger(OaWmsReturnAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_824c0f2.info("OaWmsReturnAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -69,6 +70,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless // 获取申请人直接上级 String zjsj = ""; sql = "select (select lastname from employee as hrmresource where id=b.superior) as zjsj from " + tableName + " a,employee b where a.sqr=b.id and a.requestId =" + requestid; + logger_824c0f2.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -92,6 +94,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless str = service.call(param, requestid, cfxt); logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + str[0] + "-" + str[1])); sql = "update " + tableName + " set state='" + str[0] + "',message='" + str[1] + "' where requestId=" + requestid; + logger_824c0f2.info("sql--" + sql); String poolname_et = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_et); @@ -101,10 +104,11 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless } } catch (Exception e) { sql = "update " + tableName + " set state='E',message='" + e.toString() + "' where requestId=" + requestid; + logger_824c0f2.info("sql--"+sql); String poolname_bm = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_bm); - logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + e.toString())); + logger_824c0f2.error(String.valueOf(requestid + "--OaWmsReturnAction--result:" + e.toString())); requestinfo.getRequestManager().setMessagecontent("审批结果返回光导WMS系统出错：" + e.toString()); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } @@ -112,7 +116,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless } catch (Exception e) { e.printStackTrace(); logger_824c0f2.error("OaWmsReturnAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java index 9aca9d0..4ea99dc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java @@ -37,6 +37,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } public WeaResult> execute(Map requestInfoMap) { + logger_9c33175e.info("OperateAccountAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -80,6 +81,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } String sta = ""; String getStatus = "select status from " + tablename + " where requestId=" + requestId; + logger_9c33175e.info("getStatus" + getStatus); String poolname_2x = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(getStatus, poolname_2x); @@ -115,6 +117,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } } String sql = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + logger_9c33175e.info("sql" + sql); String poolname_y8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_y8); @@ -126,13 +129,14 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(errorLog, poolname); - logger_9c33175e.info(String.valueOf(requestId + "开户销户失败：" + e.toString())); + logger_9c33175e.error(String.valueOf(requestId + "开户销户失败：" + e.toString())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_9c33175e.error("OperateAccountAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } }