From 62f3b317ae36fdf0fc3e8cc5e6a772d993dba30d Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 26 Dec 2024 14:22:07 +0800 Subject: [PATCH] 38 files update --- .../workflow/action/OperateEmailAccountAction.java | 9 +++++++-- .../workflow/action/OperateMesAccountAction.java | 9 +++++++-- .../workflow/action/PMProjectAcceptanceAction.java | 7 ++++--- .../interfaces/workflow/action/PushMeetingAction.java | 3 ++- .../action/ReturnApprovalResultToK3Action.java | 7 +++++-- .../action/SCFAndEASApplyUserCheckAction.java | 7 +++++-- .../workflow/action/SCFAndEASApplyUserSyncAction.java | 7 +++++-- .../workflow/action/SY_WLPS_NEW_RETURNAction.java | 10 ++++++---- .../workflow/action/SY_WLPS_RETURNAction.java | 6 +++++- .../workflow/action/ScfDraftApplyResultAction.java | 5 +++-- .../workflow/action/TransferBillToK3Action.java | 10 ++++++++-- .../workflow/action/UpdateFwInfoAction.java | 8 +++++--- .../action/UpdateSeclevelAndpasswordlock.java | 11 ++++++++--- .../interfaces/workflow/action/UpdateTaskNumber.java | 9 ++++++--- .../workflow/action/XNY_YCLTC_ReturnAction.java | 9 +++++++-- .../workflow/action/YongGongXuQiuAction.java | 10 ++++++++-- .../workflow/action/ZOA_CCSQ_AQJB_Action.java | 8 +++++--- .../workflow/action/ZOA_FICO_ANLA_CHANGEAction.java | 8 ++++++-- .../workflow/action/ZOA_FICO_COC_CREATIONAction.java | 7 ++++++- .../action/ZOA_FI_CONUNIT_REDUNCHECKAction.java | 1 + .../action/ZOA_FI_CUSTOMER_MAINTAINAction.java | 11 ++++++++--- .../workflow/action/ZOA_FI_IORD_RFC_Action.java | 11 ++++++++--- .../workflow/action/ZOA_FI_IORD_RFC_CheckAction.java | 7 +++++-- .../action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java | 6 +++++- .../workflow/action/ZOA_MM_PR_CREATE_BpAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_FYH_BgAction.java | 1 + .../action/ZOA_MM_PR_CREATE_FYH_FyAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java | 7 +++++-- .../action/ZOA_MM_PR_CREATE_JGJ_JgAction.java | 5 +++-- .../workflow/action/ZOA_MM_PR_CREATE_LbAction.java | 7 +++++-- .../workflow/action/ZOA_MM_PR_CREATE_SCXAction.java | 7 +++++-- .../workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java | 7 +++++-- .../workflow/action/ZOA_MM_PR_CREATE_YFAction.java | 6 ++++-- .../action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java | 6 ++++-- .../action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java | 6 ++++-- .../workflow/action/ZOA_MM_PR_RELEASEAction.java | 10 +++++++--- .../action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java | 6 ++++-- .../workflow/action/ZOA_PRICE_RFCAction.java | 11 ++++++----- 38 files changed, 198 insertions(+), 81 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java index 2e14544..8b4ee83 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java @@ -61,6 +61,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe } public WeaResult> execute(Map requestInfoMap) { + logger_7c6670cc.info("OperateEmailAccountAction 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))); @@ -178,21 +179,25 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe } } sql = "update " + tablename + " set status='" + res[0] + "',message='" + res[1] + "' where requestId=" + requestId; + logger_7c6670cc.info("sql--" + sql); String poolname_46 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_46); if ("E".equals(res[0])) { request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + res[1]); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } } catch (Exception e) { sql = "update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestId; + logger_7c6670cc.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); - logger_7c6670cc.info(String.valueOf(requestId + "处理邮箱账号失败：" + e.toString())); + logger_7c6670cc.error(String.valueOf(requestId + "处理邮箱账号失败：" + e.toString())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + e.toString()); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } finally { client.close(); } @@ -200,7 +205,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe } catch (Exception e) { e.printStackTrace(); logger_7c6670cc.error("OperateEmailAccountAction 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())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java index 375c631..4fe446d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java @@ -41,6 +41,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } public WeaResult> execute(Map requestInfoMap) { + logger_4057422d.info("OperateMesAccountAction 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))); @@ -84,6 +85,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } String sta = ""; String getStatus = "select status from " + tablename + " where requestId=" + requestId; + logger_4057422d.info("getStatus" + getStatus); String poolname_me = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(getStatus, poolname_me); @@ -119,6 +121,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } } String sql = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + logger_4057422d.info("sql" + sql); String poolname_cc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_cc); @@ -127,16 +130,18 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ stat = "E"; message = e.toString(); String errorLog = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + logger_4057422d.info("errorLog" + errorLog); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(errorLog, poolname); - logger_4057422d.info(String.valueOf(requestId + "开户销户失败：" + e.toString())); + logger_4057422d.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_4057422d.error("OperateMesAccountAction 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())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java index 2816f7d..1af8cec 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PMProjectAcceptanceAction.java @@ -42,6 +42,7 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe private static final Logger logger_f17f81aa = LoggerFactory.getLogger(PMProjectAcceptanceAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_f17f81aa.info("PMProjectAcceptanceAction 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))); @@ -173,8 +174,8 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } } catch (Exception e) { - logger_f17f81aa.info(String.valueOf(e)); - logger_f17f81aa.info(String.valueOf(requestid + "--PMProjectAcceptanceAction--error--" + e.toString())); + logger_f17f81aa.error(String.valueOf(requestid + "--PMProjectAcceptanceAction--error--" + e.toString())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("调用项目管理系统接口失败，请联系管理员！"); @@ -182,7 +183,7 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe } catch (Exception e) { e.printStackTrace(); logger_f17f81aa.error("PMProjectAcceptanceAction 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())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java index d03bf4b..a8bf105 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java @@ -63,6 +63,7 @@ public class PushMeetingAction extends BaseBean implements Action, EsbServerless private static String password = "123456"; private static String type = "22";*/ public WeaResult> execute(Map requestInfoMap) { + logger_88956bf8.info("PushMeetingAction 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))); @@ -157,7 +158,7 @@ public class PushMeetingAction extends BaseBean implements Action, EsbServerless } catch (Exception e) { e.printStackTrace(); logger_88956bf8.error("PushMeetingAction 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())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ReturnApprovalResultToK3Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ReturnApprovalResultToK3Action.java index 01cff19..ea1c4ad 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ReturnApprovalResultToK3Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ReturnApprovalResultToK3Action.java @@ -33,6 +33,7 @@ public class ReturnApprovalResultToK3Action extends BaseBean implements Action, } public WeaResult> execute(Map requestInfoMap) { + logger_c84d53c8.info("ReturnApprovalResultToK3Action 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))); @@ -86,17 +87,19 @@ public class ReturnApprovalResultToK3Action extends BaseBean implements Action, logger_c84d53c8.info(String.valueOf(requestId + "调用K3返回审批结果接口出错：" + str[1])); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("K3返回错误信息：" + str[1]); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", str[1], request.getRequestManager())); } } catch (Exception e) { - logger_c84d53c8.info(String.valueOf(requestId + "调用K3返回审批结果接口出错：" + e.toString())); + logger_c84d53c8.error(String.valueOf(requestId + "调用K3返回审批结果接口出错：" + e.toString())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("K3返回错误信息：" + e.toString()); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", str[1], request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_c84d53c8.error("ReturnApprovalResultToK3Action 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", "", request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserCheckAction.java index 27e5b1e..44afaec 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserCheckAction.java @@ -34,6 +34,7 @@ public class SCFAndEASApplyUserCheckAction extends BaseBean implements Action, E private static final Logger logger_f844853c = LoggerFactory.getLogger(SCFAndEASApplyUserCheckAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_f844853c.info("SCFAndEASApplyUserCheckAction 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))); @@ -108,19 +109,21 @@ public class SCFAndEASApplyUserCheckAction extends BaseBean implements Action, E logger_f844853c.info(String.valueOf(requestid + "报账系统返回错误信息：" + srMessage)); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("报账系统返回错误信息：" + srMessage); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager())); } } } catch (Exception e) { - logger_f844853c.info(String.valueOf(requestid + "调用报账系统校验流程发起人信息接口出错：" + e.toString())); + logger_f844853c.error(String.valueOf(requestid + "调用报账系统校验流程发起人信息接口出错：" + e.toString())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("调用报账系统接口返回失败，请联系报账系统管理员！"); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_f844853c.error("SCFAndEASApplyUserCheckAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java index 11f2224..75f2ae7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java @@ -38,6 +38,7 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es private static final Logger logger_c018d513 = LoggerFactory.getLogger(SCFAndEASApplyUserSyncAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_c018d513.info("SCFAndEASApplyUserSyncAction 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))); @@ -127,14 +128,16 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es logger_c018d513.info(String.valueOf(requestid + "报账系统返回错误信息：" + srMessage)); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("报账系统返回错误信息：" + srMessage); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager())); } else { updateData(sqr, companyCode, list); } } } catch (Exception e) { - logger_c018d513.info(String.valueOf(requestid + "调用报账系统同步流程发起人信息接口出错：" + e.toString())); + logger_c018d513.error(String.valueOf(requestid + "调用报账系统同步流程发起人信息接口出错：" + e.toString())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("调用报账系统接口返回失败，请联系报账系统管理员！"); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } } else { logger_c018d513.info(String.valueOf("不需要调用接口")); @@ -146,7 +149,7 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es } catch (Exception e) { e.printStackTrace(); logger_c018d513.error("SCFAndEASApplyUserSyncAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java index d2035d0..632b0ac 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java @@ -39,6 +39,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer } public WeaResult> execute(Map requestInfoMap) { + logger_882eb0b2.info("SY_WLPS_NEW_RETURNAction 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))); @@ -101,29 +102,30 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer String poolname_9c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_9c); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager())); } logger_882eb0b2.info(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行结束")); } catch (Exception exception) { - logger_882eb0b2.info(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); + logger_882eb0b2.error(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + logger_882eb0b2.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_882eb0b2.error("SY_WLPS_NEW_RETURNAction 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", e.getMessage(), requestinfo.getRequestManager())); } } /** * 通过数据库字段名获取选择框 显示名 * - * @param val - * @param id * @return */ public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java index 116c16f..7cc6762 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNAction.java @@ -46,6 +46,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl } public WeaResult> execute(Map requestInfoMap) { + logger_1852f2d3.info("SY_WLPS_RETURNAction 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))); @@ -94,6 +95,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + logger_1852f2d3.info("sql--" + sql); String poolname_ki = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_ki); @@ -103,15 +105,17 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl logger_1852f2d3.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + logger_1852f2d3.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_1852f2d3.error("SY_WLPS_RETURNAction 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ScfDraftApplyResultAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ScfDraftApplyResultAction.java index 1d7a8f6..dd7e92e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ScfDraftApplyResultAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ScfDraftApplyResultAction.java @@ -35,6 +35,7 @@ public class ScfDraftApplyResultAction extends BaseBean implements Action, EsbSe @Override public WeaResult> execute(Map requestInfoMap) { + logger_d39bef7.info("ScfDraftApplyResultAction 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))); @@ -103,7 +104,7 @@ public class ScfDraftApplyResultAction extends BaseBean implements Action, EsbSe } logger_d39bef7.info(String.valueOf("ScfDraftApplyResultAction--end--" + requestID)); } catch (Exception e) { - logger_d39bef7.info(String.valueOf(requestID + "调用供应链金融系统返回审批结果接口出错：" + e.toString())); + logger_d39bef7.error(String.valueOf(requestID + "调用供应链金融系统返回审批结果接口出错：" + e.toString())); // requestInfo.getRequestManager().setMessageid("ERROR"); requestInfo.getRequestManager().setMessagecontent("调用供应链金融系统开票申请审批接口返回失败，请联系供应链金融系统管理员！"); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); @@ -112,7 +113,7 @@ public class ScfDraftApplyResultAction extends BaseBean implements Action, EsbSe } catch (Exception e) { e.printStackTrace(); logger_d39bef7.error("ScfDraftApplyResultAction 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", FAILURE_AND_CONTINUE, requestInfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java index 8fade2b..c6e3793 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/TransferBillToK3Action.java @@ -46,6 +46,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe @Override public WeaResult> execute(Map requestInfoMap) { + logger_1a36f94a.info("TransferBillToK3Action 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))); @@ -145,9 +146,11 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe if ("0".equals(str[0])) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("K3系统返回错误信息：" + str[1]); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager())); } if (str[3].length() > 0) { sql = "update " + tablename + "_dt1 set tbzt=1 where ckbm in (" + str[3].substring(0, str[3].length() - 1) + ") and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + logger_1a36f94a.info("sql--"+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -155,6 +158,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } if (str[2].length() > 0) { sql = "update " + tablename + "_dt1 set tbzt=0 where ckbm in (" + str[2].substring(0, str[2].length() - 1) + ") and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + logger_1a36f94a.info("sql--"+sql); String poolname_ji = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_ji); @@ -162,6 +166,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } if (str[2].length() == 0 && str[3].length() == 0) { sql = "update " + tablename + "_dt1 set tbzt=0 where (tbzt is null or tbzt !=1) and mainid =(select id from " + tablename + " where requestid=" + requestid + ")"; + logger_1a36f94a.info("sql--"+sql); String poolname_19 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_19); @@ -170,9 +175,10 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } } catch (Exception e) { message = e.toString(); - logger_1a36f94a.info(String.valueOf("TransferBillToK3Action--error-" + requestid + "-" + message)); + logger_1a36f94a.error(String.valueOf("TransferBillToK3Action--error-" + requestid + "-" + message)); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("K3系统返回错误信息：" + e.toString()); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); } String poolname_sn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -181,7 +187,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe } catch (Exception e) { e.printStackTrace(); logger_1a36f94a.error("TransferBillToK3Action 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java index a2777cc..9f1531a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java @@ -30,6 +30,7 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles private static final Logger logger_af68f31d = LoggerFactory.getLogger(UpdateFwInfoAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_af68f31d.info("UpdateFwInfoAction 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))); @@ -59,7 +60,7 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles String spzt = String.valueOf(map.get("SPZT")); // 把状态更新到表单建模中 String sql = "update uf_FW01301 set xajzt = " + spzt + " where id = " + ajxx; - logger_af68f31d.info(String.valueOf((new StringBuilder()).append("UpdateFwInfoAction 更新到表单建模 logsql:").append(sql).toString())); + logger_af68f31d.info(String.valueOf("UpdateFwInfoAction sql:" + sql)); // rs.execute(sql); // 状态更新成功后 对单条数据进行重构 ModeRightInfo info = I18nContextUtil.getBean(ModeRightInfo.class); @@ -71,9 +72,10 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles TODO // 创建人字段已废弃 默认是用billid 数据对应的数据创建人*/ info.rebuildModeDataShareByEdit(0, 108, Integer.parseInt(ajxx)); } catch (Exception e) { - logger_af68f31d.info(String.valueOf(e.getMessage())); + logger_af68f31d.error(String.valueOf(e.getMessage())); state = "E"; message = e.getMessage(); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } finally { // 重构成功后 更新状态 String sql2 = (new StringBuilder()).append("update ").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where requestId = ").append(requestid).toString(); @@ -87,7 +89,7 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles } catch (Exception e) { e.printStackTrace(); logger_af68f31d.error("UpdateFwInfoAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSeclevelAndpasswordlock.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSeclevelAndpasswordlock.java index 218fa5a..cf9f0eb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSeclevelAndpasswordlock.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSeclevelAndpasswordlock.java @@ -31,6 +31,7 @@ public class UpdateSeclevelAndpasswordlock extends BaseBean implements Action, E private static final Logger logger_54eacf62 = LoggerFactory.getLogger(UpdateSeclevelAndpasswordlock.class); public WeaResult> execute(Map requestInfoMap) { + logger_54eacf62.info("UpdateSeclevelAndpasswordlock 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))); @@ -60,7 +61,8 @@ public class UpdateSeclevelAndpasswordlock extends BaseBean implements Action, E if (map.get("xglx").equals("0")) { String userid = map.get("xgyhxm"); String seclevel = map.get("xaqjb"); - String sql = "update employee as hrmresource set seclevel=" + seclevel + " where id=" + userid; + String sql = "update eteams.dbo.employee as hrmresource set seclevel=" + seclevel + " where id=" + userid; + logger_54eacf62.info(String.valueOf("修改安全级别和密码解锁sql:" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -68,6 +70,7 @@ public class UpdateSeclevelAndpasswordlock extends BaseBean implements Action, E if (map.get("xglx").equals("1")) { String userid = map.get("xgyhxm"); String sql = "update employee as hrmresource set passwordlock=0 where id=" + userid; + logger_54eacf62.info(String.valueOf("修改安全级别和密码解锁sql:" + sql)); String poolname_ow = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_ow); @@ -75,7 +78,8 @@ public class UpdateSeclevelAndpasswordlock extends BaseBean implements Action, E if (map.get("xglx").equals("2")) { String userid = map.get("xgyhxm"); String seclevel = map.get("xaqjb"); - String sql = "update employee as hrmresource set passwordlock=0,seclevel=" + seclevel + " where id=" + userid; + String sql = "update eteams.dbo.employee as hrmresource set passwordlock=0,seclevel=" + seclevel + " where id=" + userid; + logger_54eacf62.info(String.valueOf("修改安全级别和密码解锁sql:" + sql)); String poolname_fw = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_fw); @@ -84,12 +88,13 @@ public class UpdateSeclevelAndpasswordlock extends BaseBean implements Action, E logger_54eacf62.info(String.valueOf(requestid + "修改安全级别和密码解锁结束")); } catch (Exception e) { logger_54eacf62.info(String.valueOf("修改安全级别和密码解锁出错：" + e.toString())); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_54eacf62.error("UpdateSeclevelAndpasswordlock 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", "", request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java index 7a3b9c4..c85da41 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java @@ -29,6 +29,7 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface private static final Logger logger_2c12a616 = LoggerFactory.getLogger(UpdateTaskNumber.class); public WeaResult> execute(Map requestInfoMap) { + logger_2c12a616.info("UpdateTaskNumber 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))); @@ -50,7 +51,8 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String requestId = paramRequestInfo.getRequestid(); String tablename = paramRequestInfo.getRequestManager().getBillTableName(); - String sql = "select t.id from " + tablename + "_dt1 t left join " + tablename + " a on a.id = t.mainid where a.requestId = " + requestId + " order by t.id"; + String sql = "select t.id from e10_core_business.dbo." + tablename + "_dt1 t left join e10_core_business.dbo." + tablename + " a on a.form_data_id = t.form_data_id where a.id = " + requestId + " order by t.id"; + logger_2c12a616.info(String.valueOf("sql=" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); @@ -63,7 +65,7 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface } else { seq = (k + 1) + ""; } - String sql1 = "update " + tablename + "_dt1 set rwbh='" + rwbh + "_" + seq + "' where id=" + id; + String sql1 = "update e10_core_business.dbo." + tablename + "_dt1 set rwbh='" + rwbh + "_" + seq + "' where id=" + id; logger_2c12a616.info(String.valueOf("sql1=" + sql)); String poolname_dw = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -74,12 +76,13 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface logger_2c12a616.info(String.valueOf(e.getMessage())); paramRequestInfo.getRequestManager().setMessageid("ERROR"); paramRequestInfo.getRequestManager().setMessagecontent(e.getMessage()); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", paramRequestInfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, paramRequestInfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_2c12a616.error("UpdateTaskNumber e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), paramRequestInfo.getRequestManager())), paramRequestInfo.getRequestManager())); + return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", paramRequestInfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java index d222625..93147dd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/XNY_YCLTC_ReturnAction.java @@ -42,6 +42,7 @@ public class XNY_YCLTC_ReturnAction extends BaseBean implements Action, EsbServe } public WeaResult> execute(Map requestInfoMap) { + logger_555b962f.info("XNY_YCLTC_ReturnAction 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))); @@ -88,19 +89,23 @@ public class XNY_YCLTC_ReturnAction extends BaseBean implements Action, EsbServe String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + logger_555b962f.info("sql--" + sql); String poolname_ah = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_ah); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } logger_555b962f.info(String.valueOf("XNY_YCLTC_ReturnAction--" + requestId + "执行结束")); } catch (Exception exception) { logger_555b962f.info(String.valueOf("XNY_YCLTC_ReturnAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); + } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index c4eee1d..2f872ea 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -47,6 +47,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf } public WeaResult> execute(Map requestInfoMap) { + logger_42aadd27.info("YongGongXuQiuAction 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))); @@ -70,6 +71,7 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf String workflowid = request.getWorkflowid(); String maintable = ""; String sql = "select b.tablename from wfp_base a,form b where a.formid = b.id and a.id = " + workflowid; + logger_42aadd27.info("getMainTableInfo sql = " + sql); String createsqlString = "select id from employee as hrmresource where lastname ='" + creater + "'"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -123,14 +125,18 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf XQBM = value; String poolname_rh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from department as HrmDepartment where id =" + XQBM, poolname_rh); + String sql1 = "select code from department as HrmDepartment where id =" + XQBM; + logger_42aadd27.info("getMainTableInfo sql = " + sql1); + rs.executeSql(sql1, poolname_rh); rs.next(); DeptID = Util.null2String(rs.getString("departmentcode")); } else if (name.equals("XQGW")) { XQGW = value; String poolname_qe = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select code from position as HrmJobTitles where id =" + XQGW, poolname_qe); + String sql1 = "select code from position as HrmJobTitles where id =" + XQGW; + logger_42aadd27.info("getMainTableInfo sql = " + sql1); + rs.executeSql(sql1, poolname_qe); rs.next(); positionID = Util.null2String(rs.getString("jobtitlecode")); } else if (name.equals("SQRQ")) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java index 593ced7..562916e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java @@ -44,6 +44,7 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl private static final Logger logger_31bb84de = LoggerFactory.getLogger(ZOA_CCSQ_AQJB_Action.class); public WeaResult> execute(Map requestInfoMap) { + logger_31bb84de.info("ZOA_CCSQ_AQJB_Action 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))); @@ -90,7 +91,7 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl sqr = "0"; } if (!tablename.equals("")) { - logsql = "update " + tablename + " set aqjb = (select max(seclevel) from employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set aqjb = (select max(seclevel) from employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where requestId = " + reid; logger_31bb84de.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -98,14 +99,15 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl } logger_31bb84de.info(String.valueOf("ZOA_CCSQ_AQJB_Action-Request: " + reid + "完成")); } catch (Exception e) { - logger_31bb84de.info(String.valueOf("Exception:" + e.getMessage())); + logger_31bb84de.error(String.valueOf("Exception:" + e.getMessage())); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); // e.printStackTrace(); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_31bb84de.error("ZOA_CCSQ_AQJB_Action 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java index c56c1c3..d768f0e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_ANLA_CHANGEAction.java @@ -38,6 +38,7 @@ public class ZOA_FICO_ANLA_CHANGEAction extends BaseBean implements Action, EsbS } public WeaResult> execute(Map requestInfoMap) { + logger_14793b45.info("ZOA_FICO_ANLA_CHANGEAction 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))); @@ -63,28 +64,31 @@ public class ZOA_FICO_ANLA_CHANGEAction extends BaseBean implements Action, EsbS String e_istat = String.valueOf(returnStr[0]); String e_message = String.valueOf(returnStr[1]); if ("S".equals(e_istat)) { - String sql = "update " + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where requestId = " + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where id = " + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); } else { requestinfo.getRequestManager().setMessageid(e_istat); requestinfo.getRequestManager().setMessagecontent(e_message); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e_message, requestinfo.getRequestManager())); } } else { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用接口返回信息为空"); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "调用接口返回信息为空", requestinfo.getRequestManager())); } } catch (Exception exception) { logger_14793b45.info(String.valueOf("ZOA_FICO_ANLA_CHANGEAction error:" + exception.getMessage())); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent(exception.getMessage()); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_14793b45.error("ZOA_FICO_ANLA_CHANGEAction 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java index d168052..7d400f4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java @@ -38,6 +38,7 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb } public WeaResult> execute(Map requestInfoMap) { + logger_8236b79b.info("ZOA_FICO_COC_CREATIONAction 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))); @@ -71,27 +72,31 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb String e_message = String.valueOf(returnStr[1]); if ("S".equals(e_istat)) { String sql = "update " + tablename + " set sta ='" + e_istat + "', meg = '" + e_message + "' where requestId = " + requestId; + logger_8236b79b.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); } else { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent(e_message); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e_message, requestinfo.getRequestManager())); } } else { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用接口返回信息为空"); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "调用接口返回信息为空", requestinfo.getRequestManager())); } } catch (Exception exception) { logger_8236b79b.info(String.valueOf("ZOA_FICO_COC_CREATIONAction error:" + exception.getMessage())); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent(exception.getMessage()); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_8236b79b.error("ZOA_FICO_COC_CREATIONAction 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java index d5c323d..ea56f51 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java @@ -30,6 +30,7 @@ public class ZOA_FI_CONUNIT_REDUNCHECKAction extends BaseBean implements Action, private static final Logger logger_7e39b657 = LoggerFactory.getLogger(ZOA_FI_CONUNIT_REDUNCHECKAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_7e39b657.info("ZOA_FI_CONUNIT_REDUNCHECKAction 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))); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java index 380e7bf..a38f85d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CUSTOMER_MAINTAINAction.java @@ -35,6 +35,7 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, private static final Logger logger_30bd33f8 = LoggerFactory.getLogger(ZOA_FI_CUSTOMER_MAINTAINAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_30bd33f8.info("ZOA_FI_CUSTOMER_MAINTAINAction 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))); @@ -217,9 +218,11 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, String output = "----" + date + "," + time + "," + meg; String logsql = ""; if (kunnr.equals("")) { - logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + output + "' where requestId = " + reid; + logger_30bd33f8.info(String.valueOf("start log--" + edit_flag + "--" + reid)); } else { - logsql = "update " + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', khdm = '" + kunnr + "', meg = '" + output + "' where requestId = " + reid; + logger_30bd33f8.info(String.valueOf("start log--" + edit_flag + "--" + reid)); } String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -232,6 +235,7 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); request.getRequestManager().setMessagecontent("返回消息----" + meg); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager())); } } catch (Exception e) { // BaseBean baseBean = new BaseBean(); @@ -240,12 +244,13 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action, logger_30bd33f8.info(String.valueOf("ZOA_FI_CUSTOMER_MAINTAINAction error:" + e.toString())); logger_30bd33f8.info(String.valueOf("------------------------------------------------------------------------")); logger_30bd33f8.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_30bd33f8.error("ZOA_FI_CUSTOMER_MAINTAINAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java index 5f9d833..4882d5d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_Action.java @@ -31,6 +31,7 @@ public class ZOA_FI_IORD_RFC_Action extends BaseBean implements Action, EsbServe @Override public WeaResult> execute(Map requestInfoMap) { + logger_a0e600a3.info("ZOA_FI_IORD_RFC_Action 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))); @@ -82,23 +83,27 @@ public class ZOA_FI_IORD_RFC_Action extends BaseBean implements Action, EsbServe RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set state='" + ret[0][0] + "',message='" + ret[0][1] + "',nbddh=isnull('" + ret[0][2] + "','') where requestId=" + requestid, poolname); + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0][0] + "',message='" + ret[0][1] + "',nbddh=isnull('" + ret[0][2] + "','') where requestId=" + requestid; + logger_a0e600a3.info(String.valueOf("ZOA_FI_IORD_RFC_Action--sql--" + sql + "-" + requestid)); + rs.executeSql(sql, poolname); if (!"S".equals(ret[0][0])) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + ret[0][1]); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", ret[0][1], requestinfo.getRequestManager())); } } } catch (Exception e) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + e.toString()); - logger_a0e600a3.info(String.valueOf("ZOA_FI_IORD_RFC_Action--error--[" + e.toString() + "]-" + requestid)); + logger_a0e600a3.error(String.valueOf("ZOA_FI_IORD_RFC_Action--error--[" + e.toString() + "]-" + requestid)); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); } logger_a0e600a3.info(String.valueOf("ZOA_FI_IORD_RFC_Action--end--" + requestid)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_a0e600a3.error("ZOA_FI_IORD_RFC_Action 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java index e0aafc9..d39793c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_IORD_RFC_CheckAction.java @@ -28,6 +28,7 @@ public class ZOA_FI_IORD_RFC_CheckAction extends BaseBean implements Action, Esb @Override public WeaResult> execute(Map requestInfoMap) { + logger_ca356311.info("ZOA_FI_IORD_RFC_CheckAction 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))); @@ -79,19 +80,21 @@ public class ZOA_FI_IORD_RFC_CheckAction extends BaseBean implements Action, Esb if (!"S".equals(ret[0][0])) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + ret[0][1]); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", ret[0][1], requestinfo.getRequestManager())); } } } catch (Exception e) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回错误信息：" + e.toString()); - logger_ca356311.info(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--error--[" + e.toString() + "]-" + requestid)); + logger_ca356311.error(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--error--[" + e.toString() + "]-" + requestid)); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); } logger_ca356311.info(String.valueOf("ZOA_FI_IORD_RFC_CheckAction--end--" + requestid)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_ca356311.error("ZOA_FI_IORD_RFC_CheckAction 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java index 5a35989..2c7c5b1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java @@ -35,6 +35,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action private static final Logger logger_2da6de30 = LoggerFactory.getLogger(ZOA_FI_VENDOR_MAINTAIN_GYSAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_2da6de30.info("ZOA_FI_VENDOR_MAINTAIN_GYSAction 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))); @@ -234,6 +235,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action } else { logsql = "update " + tablename + " set sta ='" + sta + "', gysdm = '" + lifnr + "', meg = '" + output + "' where requestId = " + reid; } + logger_2da6de30.info(String.valueOf("start logsql--" + logsql + "--" + reid)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -245,6 +247,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action if (!sta.equals("S")) { request.getRequestManager().setMessageid("100001"); request.getRequestManager().setMessagecontent("返回消息----" + meg); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager())); } } catch (Exception e) { // BaseBean baseBean = new BaseBean(); @@ -253,12 +256,13 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action logger_2da6de30.info(String.valueOf("ZOA_FI_VENDOR_MAINTAIN_GYSAction error:" + e.toString())); logger_2da6de30.info(String.valueOf("------------------------------------------------------------------------")); logger_2da6de30.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_2da6de30.error("ZOA_FI_VENDOR_MAINTAIN_GYSAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java index 4e9541c..60bda81 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_BpAction.java @@ -47,6 +47,7 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe private static final Logger logger_8cb80c57 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_BpAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_8cb80c57.info("ZOA_MM_PR_CREATE_BpAction 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))); @@ -165,7 +166,8 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -181,12 +183,13 @@ public class ZOA_MM_PR_CREATE_BpAction extends BaseBean implements Action, EsbSe logger_8cb80c57.info(String.valueOf(nowTime + " " + reid + "ZOA_MM_PR_CREATE_BpAction error:" + e.toString())); logger_8cb80c57.info(String.valueOf("------------------------------------------------------------------------")); logger_8cb80c57.info(String.valueOf("end log--")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_8cb80c57.error("ZOA_MM_PR_CREATE_BpAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java index a497327..c018dcf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_BgAction.java @@ -47,6 +47,7 @@ public class ZOA_MM_PR_CREATE_FYH_BgAction extends BaseBean implements Action, E private static final Logger logger_371c14b8 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_FYH_BgAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_371c14b8.info("ZOA_MM_PR_CREATE_FYH_BgAction 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))); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java index acdf778..34e7abd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_FYH_FyAction.java @@ -41,6 +41,7 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E private static final Logger logger_8ed0f2c6 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_FYH_FyAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_8ed0f2c6.info("ZOA_MM_PR_CREATE_FYH_FyAction 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))); @@ -162,7 +163,8 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + logger_8ed0f2c6.info(String.valueOf("ZOA_MM_PR_CREATE_FYH_FyAction:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -178,12 +180,13 @@ public class ZOA_MM_PR_CREATE_FYH_FyAction extends BaseBean implements Action, E logger_8ed0f2c6.info(String.valueOf("ZOA_MM_PR_CREATE_FYH_FyAction error:" + e.toString())); logger_8ed0f2c6.info(String.valueOf("------------------------------------------------------------------------")); logger_8ed0f2c6.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_8ed0f2c6.error("ZOA_MM_PR_CREATE_FYH_FyAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java index e70c954..72bc147 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_GDZC_ZcAction.java @@ -44,6 +44,7 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, private static final Logger logger_a58ea05 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_GDZC_ZcAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_a58ea05.info("ZOA_MM_PR_CREATE_GDZC_ZcAction 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))); @@ -174,7 +175,8 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + logger_a58ea05.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -190,12 +192,13 @@ public class ZOA_MM_PR_CREATE_GDZC_ZcAction extends BaseBean implements Action, logger_a58ea05.info(String.valueOf("ZOA_MM_PR_CREATE_GDZC_ZcAction error:" + e.toString())); logger_a58ea05.info(String.valueOf("------------------------------------------------------------------------")); logger_a58ea05.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_a58ea05.error("ZOA_MM_PR_CREATE_GDZC_ZcAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java index 625ce19..60f8cbc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java @@ -39,6 +39,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E private static final Logger logger_56a61d8 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_JGJ_JgAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_56a61d8.info("ZOA_MM_PR_CREATE_JGJ_JgAction 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))); @@ -289,7 +290,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set cgsqh ='" + cgsqh + "', state = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set cgsqh ='" + cgsqh + "', state = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -316,7 +317,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E } catch (Exception e) { e.printStackTrace(); logger_56a61d8.error("ZOA_MM_PR_CREATE_JGJ_JgAction 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, request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java index e0d1ce0..4aebeca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_LbAction.java @@ -47,6 +47,7 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe private static final Logger logger_b6ec8f7f = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_LbAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_b6ec8f7f.info("ZOA_MM_PR_CREATE_LbAction 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))); @@ -160,7 +161,8 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + logger_b6ec8f7f.info(String.valueOf("start logsql--" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -176,12 +178,13 @@ public class ZOA_MM_PR_CREATE_LbAction extends BaseBean implements Action, EsbSe logger_b6ec8f7f.info(String.valueOf("ZOA_MM_PR_CREATE_LbAction error:" + e.toString())); logger_b6ec8f7f.info(String.valueOf("------------------------------------------------------------------------")); logger_b6ec8f7f.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_b6ec8f7f.error("ZOA_MM_PR_CREATE_LbAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java index 454bfd3..6d5a8a7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java @@ -40,6 +40,7 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS private static final Logger logger_25ffe2ab = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_SCXAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_25ffe2ab.info("ZOA_MM_PR_CREATE_SCXAction 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))); @@ -162,7 +163,8 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + logger_25ffe2ab.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -178,12 +180,13 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS logger_25ffe2ab.info(String.valueOf("ZOA_MM_PR_CREATE_SCXAction error:" + e.toString())); logger_25ffe2ab.info(String.valueOf("------------------------------------------------------------------------")); logger_25ffe2ab.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_25ffe2ab.error("ZOA_MM_PR_CREATE_SCXAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java index 729b5eb..27af4f0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java @@ -40,6 +40,7 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb private static final Logger logger_54a06806 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_WWJGAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_54a06806.info("ZOA_MM_PR_CREATE_WWJGAction 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))); @@ -154,7 +155,8 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + logger_54a06806.info("logsql--" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -170,12 +172,13 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb logger_54a06806.info(String.valueOf("ZOA_MM_PR_CREATE_WWJGAction error:" + e.toString())); logger_54a06806.info(String.valueOf("------------------------------------------------------------------------")); logger_54a06806.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_54a06806.error("ZOA_MM_PR_CREATE_WWJGAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java index 53aaa6d..0ce213c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java @@ -36,6 +36,7 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe private static final Logger logger_342d5bb6 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_YFAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_342d5bb6.info("ZOA_MM_PR_CREATE_YFAction 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))); @@ -156,7 +157,8 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; + logger_342d5bb6.info("logsql" + logsql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -182,7 +184,7 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe } catch (Exception e) { e.printStackTrace(); logger_342d5bb6.error("ZOA_MM_PR_CREATE_YFAction 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, request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java index ec9e62a..1ad597f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFFY_ZjAction.java @@ -54,6 +54,7 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, private static final Logger logger_adb00a32 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_YFFY_ZjAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_adb00a32.info("ZOA_MM_PR_CREATE_YFFY_ZjAction 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))); @@ -195,7 +196,7 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -219,12 +220,13 @@ public class ZOA_MM_PR_CREATE_YFFY_ZjAction extends BaseBean implements Action, logger_adb00a32.info(String.valueOf(e)); logger_adb00a32.info(String.valueOf("------------------------------------------------------------------------")); logger_adb00a32.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_adb00a32.error("ZOA_MM_PR_CREATE_YFFY_ZjAction 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", e.getMessage(), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java index 41381c5..4433d9b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java @@ -46,6 +46,7 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, private static final Logger logger_518ea046 = LoggerFactory.getLogger(ZOA_MM_PR_CREATE_ZJGC_ZjAction.class); public WeaResult> execute(Map requestInfoMap) { + logger_518ea046.info("ZOA_MM_PR_CREATE_ZJGC_ZjAction 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))); @@ -177,7 +178,7 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, String date = datetype.format(now); String time = timetype.format(now); String output = date + "," + time + "," + meg; - String logsql = "update " + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set prno ='" + prno + "', status = '" + sta + "', message = '" + output + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs1.executeSql(logsql, poolname); @@ -193,12 +194,13 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, logger_518ea046.info(String.valueOf("ZOA_MM_PR_CREATE_ZJGC_ZjAction error:" + e.toString())); logger_518ea046.info(String.valueOf("------------------------------------------------------------------------")); logger_518ea046.info(String.valueOf("end log")); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_518ea046.error("ZOA_MM_PR_CREATE_ZJGC_ZjAction 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, request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java index 288dbe1..3e68872 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java @@ -45,6 +45,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ @SuppressWarnings("unchecked") public WeaResult> execute(Map requestInfoMap) { + logger_41a94d2d.info("ZOA_MM_PR_RELEASEAction 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))); @@ -67,7 +68,9 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ String id = ""; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - recordset.executeSql("select top 1 id from " + tablename + " where requestid = " + requestId, poolname); + String sql1 = "select top 1 id from e10_core_business.dbo." + tablename + " where id = " + requestId; + logger_41a94d2d.info("sql1 -----" + sql1); + recordset.executeSql(sql1, poolname); if (recordset.next()) { id = recordset.getString("id"); } @@ -122,7 +125,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ obj[1] = msg2; obj[2] = id; obj[3] = cgdh; - String sql = "update " + tablename + "_dt1 set state = ? , msg = ? where mainid = ? and cgdh= ?"; + String sql = "update e10_core_business.dbo." + tablename + "_dt1 set state = ? , msg = ? where form_data_id = ? and cgdh= ?"; logger_41a94d2d.info(String.valueOf("ZOA_MM_PR_RELEASEAction ----- sql = " + sql)); String poolname_nt = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -155,6 +158,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ logger_41a94d2d.info(String.valueOf((new StringBuilder()).append("ZOA_MM_PR_CREATE_BpAction error:").append(exception.toString()).toString())); logger_41a94d2d.info(String.valueOf("------------------------------------------------------------------------")); logger_41a94d2d.info(String.valueOf("end log--")); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", exception.getMessage(), requestinfo.getRequestManager())); // requestinfo.getRequestManager().setMessageid("ERROR"); // requestinfo.getRequestManager().setMessagecontent(exception.getMessage()); // return Action.SUCCESS; @@ -163,7 +167,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ } catch (Exception e) { e.printStackTrace(); logger_41a94d2d.error("ZOA_MM_PR_RELEASEAction 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/ZOA_MM_ZMMT002_FASTCONFIG_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java index 34635ff..7eb76d1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java @@ -38,6 +38,7 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action @Override public WeaResult> execute(Map requestInfoMap) { + logger_e6726d63.info("ZOA_MM_ZMMT002_FASTCONFIG_Action 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))); @@ -112,16 +113,17 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("update " + tablename + " set state='" + retstr[0] + "',message='" + retstr[1] + "' where requestId=" + requestid, poolname); + rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + retstr[0] + "',message='" + retstr[1] + "' where id=" + requestid, poolname); if ("E".equals(retstr[0])) { requestinfo.getRequestManager().setMessageid("error"); requestinfo.getRequestManager().setMessagecontent(retstr[1]); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_e6726d63.error("ZOA_MM_ZMMT002_FASTCONFIG_Action 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", e.getMessage(), requestinfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_PRICE_RFCAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_PRICE_RFCAction.java index a6e6ca7..058e4a9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_PRICE_RFCAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_PRICE_RFCAction.java @@ -44,6 +44,7 @@ public class ZOA_PRICE_RFCAction extends BaseBean implements Action, EsbServerle } public WeaResult> execute(Map requestInfoMap) { + logger_489475fd.info("ZOA_PRICE_RFCAction 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))); @@ -81,30 +82,30 @@ public class ZOA_PRICE_RFCAction extends BaseBean implements Action, EsbServerle retstr[1] = jcofunction.getExportParameterList().getValue("E_MESSAGE").toString(); logger_489475fd.info(String.valueOf("调用ZOA_PRICE_RFC函数成功：" + retstr[0] + "," + retstr[1])); } - String sql = "update " + tablename + " set jgfb= '" + retstr[0] + "',message='" + retstr[1] + "' where requestId =" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set jgfb= '" + retstr[0] + "',message='" + retstr[1] + "' where id =" + requestId; String poolname_sg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_sg); if (!"S".equals(retstr[0])) { requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("SAP返回的错误信息：" + retstr[1]); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", retstr[1], requestinfo.getRequestManager())); } } catch (Exception e) { logger_489475fd.info(String.valueOf("调用ZOA_PRICE_RFC查询价格是否发布出错：" + e.toString())); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP函数出错：：" + e.getMessage()); - String sql = "update " + tablename + " set jgfb= '" + retstr[0] + "',message='" + retstr[1] + "' where requestId =" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set jgfb= '" + retstr[0] + "',message='" + retstr[1] + "' where id =" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); + return WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_489475fd.error("ZOA_PRICE_RFCAction 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", e.getMessage(), requestinfo.getRequestManager())); } }