diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java index e33fa21..5f714aa 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java @@ -23,7 +23,7 @@ public class OaSrmVenMatExtService extends BaseBean { public String[] call(SRM_OA_VENMATEXT_RESULT param) { String[] str = new String[3]; // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.SrmVenMatExt")).trim(); -// TODO custom 无法获取config + String url = configProp.getSrmVenMatExtnew(); // String url = "http://10.6.6.155:8080/srm/services/OaSrmVenMatExtService"; try { @@ -36,7 +36,7 @@ public class OaSrmVenMatExtService extends BaseBean { // HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator(); // 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()); -// TODO custom 无法获取config + HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); auth.setUsername(configProp.getPo_user()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java index f5485e4..323f8d0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java @@ -39,6 +39,9 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles private RequestInfo requestInfoTemp; @Autowired private ConfigProp configProp; + + @Autowired + private PortalPlanService service; private static final Logger logger_4411f79d = LoggerFactory.getLogger(CarApplyInfoAction.class); @Override @@ -115,7 +118,7 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles info.put("category", "用车"); info.put("source", "1"); info.put("content", content.toString()); - PortalPlanService service = new PortalPlanService(); +// PortalPlanService service = new PortalPlanService(); InsertPlan insertData = JSONObject.parseObject(JSON.toJSONString(info), InsertPlan.class); String[] str = service.insertPlan(insertData); logger_4411f79d.info(requestid + "-CarApplyInfoAction-传值[" + JSON.toJSONString(info) + "]"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java index 825d5aa..7a9ceb0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java @@ -33,6 +33,8 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe @Autowired private RequestInfo requestInfoTemp; + @Autowired + private CallVdDlvApplyServices service; private static final Logger logger_9af84826 = LoggerFactory.getLogger(OaSrmVendorAdmitAction.class); @Override @@ -160,7 +162,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe } dlvapplyin.setItems(items); } - CallVdDlvApplyServices service = new CallVdDlvApplyServices(); +// CallVdDlvApplyServices service = new CallVdDlvApplyServices(); service.setOainputvendor(dlvapplyin); String[] result = service.call(); logger_9af84826.info(String.valueOf(requestid + "供应商准入接口返回值" + result[0] + "--" + result[1])); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java index c92d0bd..05da1d8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java @@ -47,6 +47,13 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe @Autowired private OaSrmVenMatExtService service; + + + @Autowired + private CallVdDlvApplyServices vddservice; + + @Autowired + private CallSrmServices srm; private static final Logger logger_a864d799 = LoggerFactory.getLogger(OaSrmVendorCheckAction.class); @Override @@ -186,9 +193,9 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe } dlvapplyin.setItems(items); } - CallVdDlvApplyServices service = new CallVdDlvApplyServices(); - service.setOainputvendor(dlvapplyin); - String[] result = service.call(); +// CallVdDlvApplyServices service = new CallVdDlvApplyServices(); + vddservice.setOainputvendor(dlvapplyin); + String[] result = vddservice.call(); logger_a864d799.info(String.valueOf(requestid + "供应商准入接口返回值" + result[0] + "--" + result[1])); state = result[0]; message = result[1]; @@ -243,7 +250,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe } oainputvendor.setItems(items); } - CallSrmServices srm = new CallSrmServices(); +// CallSrmServices srm = new CallSrmServices(); srm.setOainputvendor(oainputvendor); String[] rtInfo = srm.call(); logger_a864d799.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2])); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java index 8ed4b1d..25bee11 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java @@ -42,6 +42,10 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer private RequestInfo requestInfoTemp; @Autowired private OaSrmVenMatExtService service; + + @Autowired + private CallSrmServices srm; + private static final Logger logger_a5e612ac = LoggerFactory.getLogger(OaSrmVendorReapplyAction.class); @Override @@ -199,7 +203,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer } oainputvendor.setItems(items); } - CallSrmServices srm = new CallSrmServices(); +// CallSrmServices srm = new CallSrmServices(); srm.setOainputvendor(oainputvendor); String[] rtInfo = srm.call(); logger_a5e612ac.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2])); 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 208f3ba..abde014 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 @@ -42,6 +42,9 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer private RequestInfo requestInfoTemp; @Autowired private OaSrmVenMatExtService service; + + @Autowired + private CallSrmServices srm; private static final Logger logger_41a64316 = LoggerFactory.getLogger(OaSrmVendorSyncAction.class); @Override @@ -197,7 +200,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer } oainputvendor.setItems(items); } - CallSrmServices srm = new CallSrmServices(); +// CallSrmServices srm = new CallSrmServices(); srm.setOainputvendor(oainputvendor); String[] rtInfo = srm.call(); logger_41a64316.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2])); 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 55e6f7f..bdca897 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 @@ -55,6 +55,9 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe // } // // } + + @Autowired + private AccountService service; private static final Logger logger_7c6670cc = LoggerFactory.getLogger(OperateEmailAccountAction.class); public OperateEmailAccountAction() { @@ -219,7 +222,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe paramInfo.setMail(emailaccount); paramInfo.setOperation(state); param[0] = paramInfo; - AccountService service = new AccountService(); +// AccountService service = new AccountService(); str = service.account("HT01EIP006", param); if ("E".equals(str[0])) { logger_7c6670cc.info(String.valueOf(requestId + "---" + yhgh + "调用邮箱接口出错：" + str[1]));