diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java index 8d0453a..668c9a8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java @@ -31,12 +31,19 @@ public class EAS_YszxfpApplyResult extends BaseBean { String result = "E"; try { HttpClient client = new DefaultHttpClient(); - String url = Util.null2String(getPropValue("hteasoasync", type)).trim(); +// String url = Util.null2String(getPropValue("hteasoasync", type)).trim(); + String url = ""; + if(type.equals("EasYszxfpApplyResult")){ + url = configProp.getEasYszxfpApplyResult(); + }else if(type.equals("SCFAndEASApplyUser")){ + url = configProp.getSCFAndEASApplyUser(); + } post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); - logger_683a4c66.error("Authorization----"+Util.null2String(getPropValue("htportaloaUrl", "url_password")).trim()); - post.setHeader("Authorization", Util.null2String(getPropValue("htportaloaUrl", "url_password")).trim()); + logger_683a4c66.error("Authorization----"+configProp.getUrl_password()); +// post.setHeader("Authorization", Util.null2String(getPropValue("htportaloaUrl", "url_password")).trim()); + post.setHeader("Authorization",configProp.getUrl_password()); StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8"); post.setEntity(entity); HttpResponse response = client.execute(post); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/DidiApprovalOperate.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/DidiApprovalOperate.java index 00daecc..c54a0b7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/DidiApprovalOperate.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/DidiApprovalOperate.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.eipoa; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; import org.apache.http.HttpResponse; @@ -11,18 +12,24 @@ import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +@Component public class DidiApprovalOperate extends BaseBean { private static final Logger logger_d3de7351 = LoggerFactory.getLogger(DidiApprovalOperate.class); + @Autowired + private ConfigProp configProp; public String operteAppr(JSONObject object, String type) { HttpPost post = null; String result = "E"; try { logger_d3de7351.error(String.valueOf("开始调用滴滴接口")); HttpClient client = new SSLClient(); - String url = Util.null2String(getPropValue("htportaloaUrl", type)).trim(); +// String url = Util.null2String(getPropValue("htportaloaUrl", type)).trim(); + String url = configProp.getDidicreate(); post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); post.setHeader("Accept", "application/json; charset=UTF-8"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/iuroa/SyncDataService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/iuroa/SyncDataService.java index 44fbc5d..4f7c5c7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/iuroa/SyncDataService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/iuroa/SyncDataService.java @@ -23,7 +23,8 @@ public class SyncDataService extends BaseBean { String[] str = new String[2]; try { HttpClient client = new DefaultHttpClient(); - String url = Util.null2String(getPropValue("htiuroasync", link)).trim(); +// String url = Util.null2String(getPropValue("htiuroasync", link)).trim(); + String url = ""; post = new HttpPost(url); post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8"); StringEntity entity = new StringEntity(data.toString(), "UTF-8"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java index cc28e6f..e722c45 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java @@ -85,8 +85,10 @@ public class ConfigProp { private String dzdafd_zz_url; @Value("${newblacklist}") private String newblacklist; - - + @Value("${EasYszxfpApplyResult}") + private String EasYszxfpApplyResult; + @Value("${SCFAndEASApplyUser}") + private String SCFAndEASApplyUser; //htecmoasync @Value("${isoresulturl}") private String isoresulturl; @@ -171,8 +173,12 @@ public class ConfigProp { private String YC_CSYQTZR; @Value("${api_appkey}") private String api_appkey; - - + @Value("${didicreate}") + private String didicreate; + @Value("${didiRuleId_0}") + private String didiRuleId_0; + @Value("${didiRuleId_1}") + private String didiRuleId_1; //htpmoasync @Value("${projectConclusion}") diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java index 3e77a81..96252b1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DidiYongCheAction.java @@ -8,6 +8,8 @@ import com.weaver.seconddev.interfaces.eipoa.DidiApprovalOperate; import java.util.*; import com.weaver.common.i18n.tool.util.I18nContextUtil; import java.lang.*; + +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.verupgrade.workflow.request.RequestManager; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; import com.weaver.common.base.entity.result.WeaResult; @@ -30,6 +32,11 @@ public class DidiYongCheAction extends BaseBean implements Action, EsbServerless @Autowired private RequestInfo requestInfoTemp; + @Autowired + private DidiApprovalOperate operate; + + @Autowired + private ConfigProp configProp; private static final Logger logger_3ff37d5e = LoggerFactory.getLogger(DidiYongCheAction.class); @Override @@ -60,7 +67,13 @@ public class DidiYongCheAction extends BaseBean implements Action, EsbServerless List sendlist = new ArrayList(); sendlist.add(ycr); String spdlx = map.get("SPDLX"); - String ruleId = getPropValue("htportaloaUrl", "didiRuleId_" + map.get("YCZD")); +// String ruleId = getPropValue("htportaloaUrl", "didiRuleId_" + map.get("YCZD")); + String ruleId = ""; + if(map.get("YCZD").equals("0")){ + ruleId=configProp.getDidiRuleId_0(); + }else if(map.get("YCZD").equals("1")){ + ruleId=configProp.getDidiRuleId_1(); + } String startTime = map.get("DDKSRQ") + " 00:00:00"; String endTime = map.get("DDJSRQ") + " 23:59:59"; int tripTimes = 0; @@ -83,7 +96,7 @@ public class DidiYongCheAction extends BaseBean implements Action, EsbServerless } object.put("tripTimes", tripTimes); } - DidiApprovalOperate operate = new DidiApprovalOperate(); +// DidiApprovalOperate operate = new DidiApprovalOperate(); String result = operate.operteAppr(object, "didicreate"); logger_3ff37d5e.error(String.valueOf(requestid + "-DidiYongCheAction-result:" + result)); if (!"E".equals(result)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java index 3831608..87bd3b3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java @@ -160,6 +160,8 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS // 检验单据或者供应商的有效性 // CallEasServices services = new CallEasServices(); String[] result = null; + logger_3c7e784f.error(String.valueOf("type1：" + type1)); + logger_3c7e784f.error(String.valueOf("type2：" + type2)); if ("2".equals(type1) && "Y".equals(type2)) { // 报账单 冻结 for (int i = 0; i < bzdhArray.length; i++) { @@ -203,7 +205,8 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS } else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); for (int n = 0; n < gysidArray.length; n++) { - String sql = "select v.id,oid from e10_common.dbo.uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'"; + String sql = "select v.id,oid from e10_common.dbo.uf_eas_vendor v INNER JOIN 10_common.dbo.uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'"; + logger_3c7e784f.error("EasQuerySourceBoeNumAction sql"+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java index 5a13306..38e6cce 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java @@ -38,6 +38,8 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS @Autowired private RequestInfo requestInfoTemp; + @Autowired + private EAS_YszxfpApplyResult mGetResult; private static final Logger logger_59285be7 = LoggerFactory.getLogger(EasYszxfpApplyResultAction.class); @Override @@ -176,7 +178,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS mJson.put("boeHeaderId", boeHeaderId); mJson.put("ITFID", "HT01BZ032"); mJson.put("items", mJSONArray); - EAS_YszxfpApplyResult mGetResult = new EAS_YszxfpApplyResult(); +// EAS_YszxfpApplyResult mGetResult = new EAS_YszxfpApplyResult(); logger_59285be7.error(requestID + " " + mJson.toString()); String result = mGetResult.getApproveResult(mJson, "EasYszxfpApplyResult"); logger_59285be7.error(String.valueOf(requestID + "调用报账系统应收折现发票申请接口返回值：" + result)); 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 d59d3cb..0ff859c 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 @@ -35,6 +35,8 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es @Autowired private RequestInfo requestInfoTemp; + @Autowired + private EAS_YszxfpApplyResult mGetResult; private static final Logger logger_c018d513 = LoggerFactory.getLogger(SCFAndEASApplyUserSyncAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -114,7 +116,7 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es obj.put("checkFlag", "2"); obj.put("ITFID", "HT01BZ033"); obj.put("items", JSONArray.parseArray(JSON.toJSONString(list1))); - EAS_YszxfpApplyResult mGetResult = new EAS_YszxfpApplyResult(); +// EAS_YszxfpApplyResult mGetResult = new EAS_YszxfpApplyResult(); String result = mGetResult.getApproveResult(obj, "SCFAndEASApplyUser"); logger_c018d513.error(String.valueOf(requestid + "调用报账系统同步流程发起人信息返回值：" + result)); if (!"E".equals(result)) { diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java index b7c0ddf..b9df002 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/VendorPunishApplicationService.java @@ -89,7 +89,7 @@ public class VendorPunishApplicationService { resData.setMessage("供应商厂商意见为空！"); return res; } - String sql = "update "+tablename+" set sfty='"+isAgree+"',gyscsyj='"+supplierOpinion+"' where requestId= '"+requestId+"'"; + String sql = "update e10_core_business.dbo."+tablename+" set sfty='"+isAgree+"',gyscsyj='"+supplierOpinion+"' where id= '"+requestId+"'"; log.error("VendorPunishApplicationImpl--sql1"+sql); boolean b1 = rs.executeSql(sql, poolname); log.error("VendorPunishApplicationImpl--"+requestId+"更新成功:b1="+b1); @@ -107,7 +107,7 @@ public class VendorPunishApplicationService { resData.setMessage("愿意承担金额必须大于0！"); return res; } - String sql = "update "+tablename+" set gyscsfkyj='"+supplierOpinion+"',yycdje='"+bearMoney+"' where requestId= '"+requestId+"'"; + String sql = "update e10_core_business.dbo."+tablename+" set gyscsfkyj='"+supplierOpinion+"',yycdje='"+bearMoney+"' where id= '"+requestId+"'"; log.error("VendorPunishApplicationImpl--sql2"+sql); boolean b1 = rs.executeSql(sql, poolname);