From a383a6c5df4d72e80c1867526bd32758b809df5c Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Fri, 3 Jan 2025 14:44:40 +0800 Subject: [PATCH] 4 files update --- .../seconddev/interfaces/eipoa/AccountService.java | 13 +++++++++---- .../workflow/action/OaSrmVendorSyncAction.java | 2 +- .../workflow/action/OperateAccountAction.java | 6 +++--- .../workflow/action/ZSR_PUR_INFO_OEM_Action.java | 7 ++++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java index c96ac5f..69f5768 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java @@ -22,7 +22,9 @@ public class AccountService extends BaseBean { public String[] account(String sendid, UserSyncInfo[] arr) { String[] array = new String[2]; // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.accountUrl")).trim(); - String url = configProp.getAccountUrl(); +// TODO custom config error +// String url = configProp.getAccountUrl(); + String url = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_CRM&"; try { logger_18cc50ce.info(String.valueOf("开始调用批量开户销户接口")); SI_HTPortalUAMGMT2_OUTServiceStub stub = new SI_HTPortalUAMGMT2_OUTServiceStub(url); @@ -32,8 +34,11 @@ public class AccountService extends BaseBean { // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername(configProp.getPo_user()); - auth.setPassword(configProp.getPo_password()); + // TODO custom config error +// auth.setUsername(configProp.getPo_user()); +// auth.setPassword(configProp.getPo_password()); + auth.setUsername("pouser"); + auth.setPassword("654321"); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount request = new SI_HTPortalUAMGMT2_OUTServiceStub.UserAccount(); request.setSendid(sendid); @@ -43,7 +48,7 @@ public class AccountService extends BaseBean { array[1] = response.getUserAccountReturn(); logger_18cc50ce.info(String.valueOf("调用批量开户销户接口成功")); } catch (Exception e) { - logger_18cc50ce.info(String.valueOf("调用批量开户销户接口失败：" + e.toString())); + logger_18cc50ce.info("调用批量开户销户接口失败：" , e); array[0] = "E"; array[1] = e.toString(); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java index f669487..208f3ba 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java @@ -326,7 +326,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } } catch (Exception e) { - logger_41a64316.info(String.valueOf(e)); + logger_41a64316.info("Exception--",e); logger_41a64316.info(String.valueOf(requestid + "-OaSrmVendorSyncAction--error:" + e.toString())); requestinfo.getRequestManager().setMessagecontent("调用SRM接口同步数据异常，请联系管理员！"); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java index 4ea99dc..d27163e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java @@ -125,17 +125,17 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } catch (Exception e) { stat = "E"; message = e.toString(); - String errorLog = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(errorLog, poolname); - logger_9c33175e.error(String.valueOf(requestId + "开户销户失败：" + e.toString())); + logger_9c33175e.error(requestId + "开户销户失败：" , e); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_9c33175e.error("OperateAccountAction e: {}", e.getMessage()); + logger_9c33175e.error("OperateAccountAction e: {}", e); 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/ZSR_PUR_INFO_OEM_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java index 0e53d95..b79c723 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java @@ -51,7 +51,8 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ String requestid = requestinfo.getRequestid(); String wfid = requestinfo.getWorkflowid(); TransUtil tu = new TransUtil(); - String tablename = tu.getTableName(wfid); +// String tablename = tu.getTableName(wfid); + String tablename = requestinfo.getRequestManager().getBillTableName(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); try { logger_adc1e038.info(String.valueOf("ZSR_PUR_INFO_OEM_Action-start-" + requestid)); @@ -66,7 +67,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ StringBuilder sb = new StringBuilder(); String state = ""; int mxcount = 0; - String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt1 b where a.id = b.mainid and a.requestId =" + requestid + " and isnull(sfbjsc,1)<>0"; + String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt1 b where a.form_data_id = b.form_data_id and a.id =" + requestid + " and isnull(sfbjsc,1)<>0"; logger_adc1e038.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -143,7 +144,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ sb.append("信息记录新增结果：" + ret[1]); } BillFieldUtil util = new BillFieldUtil(); - sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id =" + requestid; logger_adc1e038.info("update sql -----"+ sql); String poolname_d9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源