diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java index e9f5c21..e727c67 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EASIntermediarySyncService.java @@ -11,7 +11,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.springframework.stereotype.Component; +@Component public class EASIntermediarySyncService extends BaseBean { private static final org.slf4j.Logger logger_cd0192cf = LoggerFactory.getLogger(EASIntermediarySyncService.class); @@ -23,7 +25,7 @@ public class EASIntermediarySyncService extends BaseBean { // String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.intermediarysync")).trim(); String url =configProp.getIntermediarysync(); try { - logger_cd0192cf.info(String.valueOf("调用报账系统中介同步接口开始")); + logger_cd0192cf.info(String.valueOf("调用报账系统中介同步接口开始 --- " + url )); SI_FiAgncyAssetApplicationSync_OUTServiceStub stub = new SI_FiAgncyAssetApplicationSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java index 48f556d..5687689 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/FeeApplicationService.java @@ -14,7 +14,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.springframework.stereotype.Component; +@Component public class FeeApplicationService extends BaseBean { private static final org.slf4j.Logger logger_2817d3b0 = LoggerFactory.getLogger(FeeApplicationService.class); @@ -23,7 +25,7 @@ public class FeeApplicationService extends BaseBean { public CostStandardSynchronizationServiceResponse call(CostStandardHead param) throws Exception { // String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim(); String url = configProp.getFeeApplication(); - logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口开始")); + logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口开始"+ url)); SI_FeeApplicationSync_OUTServiceStub stub = new SI_FeeApplicationSync_OUTServiceStub(url); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); @@ -44,7 +46,7 @@ public class FeeApplicationService extends BaseBean { info.setCostStandardHead(arr); req.setCostStandardSynchronization(info); CostStandardSynchronizationServiceResponse res = stub.sI_FeeApplicationSync_OUT(req); - logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口接口结束")); + logger_2817d3b0.info(String.valueOf("调用报账系统话费交通费接口接口结束" + res)); return res; } } 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 56ef422..4299eb7 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 @@ -65,6 +65,13 @@ public class ConfigProp { @Value("${uploadZZInfoUrl}") private String uploadZZInfoUrl; + @Value("${syncOaApplyForm}") + private String syncOaApplyForm; + + @Value("${easappkey}") + private String easappkey; + + @Value("${isoresulturl}") private String isoresulturl; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java index d416c67..c81a0ff 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASCarRepairAction.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -30,7 +31,8 @@ public class EASCarRepairAction extends BaseBean implements Action, EsbServerles // 对应E9的请求信息对象 @Autowired private RequestInfo requestInfoTemp; - + @Autowired + private ConfigProp configProp; private static final Logger logger_d8323d3f = LoggerFactory.getLogger(EASCarRepairAction.class); @Override diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java index d39eec1..c0fc8b8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediaryCheckAction.java @@ -60,6 +60,8 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS // 有效性 String sfyx = map.get("yxx"); String sql = "select mc,yxx,ywlx from uf_intermediaries where id='" + cwzjjgxz + "'"; + + logger_1e13fc37.info("sql == " + sql ); String poolname_cn = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_cn); @@ -67,6 +69,10 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS name = Util.null2String(rs.getString("mc")); yxx = Util.null2String(rs.getString("yxx")); ywlx = Util.null2String(rs.getString("ywlx")); + + logger_1e13fc37.info("name == " + name ); + logger_1e13fc37.info("yxx == " + yxx ); + logger_1e13fc37.info("ywlx == " + ywlx ); } if (name.equals(cwzjjgmc) && yxx.equals(sfyx) && jgywlx.equals(ywlx)) { logger_1e13fc37.info(String.valueOf("EASIntermediaryCheckAction：--" + requestid + "已备案中介机构信息未调整")); @@ -79,6 +85,7 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS // 纳税识别号 String nssbhxz = map.get("NSSBHXZ"); String check = "select id from uf_intermediaries where mc='" + cwzjjgmcxz + "' or nssbh='" + nssbhxz + "'"; + logger_1e13fc37.info("check == " + check ); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(check, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java index 6b0d8d4..455524d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java @@ -31,6 +31,9 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe @Autowired private RequestInfo requestInfoTemp; + @Autowired + private EASIntermediarySyncService service; + private static final Logger logger_c15112b8 = LoggerFactory.getLogger(EASIntermediarySyncAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -113,7 +116,7 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe info.setOperation(ywlx); info.setProject(map.get("JTXM")); info.setSocialCredit(sh); - EASIntermediarySyncService service = new EASIntermediarySyncService(); +// EASIntermediarySyncService service = new EASIntermediarySyncService(); String[] str = service.call(info); logger_c15112b8.info(String.valueOf(requestid + "调用报账系统中介机构同步接口返回值" + str[0] + "--" + str[1])); if (!"1".equals(str[0])) { @@ -127,6 +130,7 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String[] datetime = sdf.format(new Date()).split(" "); sql = "insert into uf_intermediaries(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,mc,ywlx,nssbh,lxr,lxfs,sfqy,yxx) values(122," + sqrid + ",0,'" + datetime[0] + "','" + datetime[1] + "','" + name + "'," + map.get("YWLXXZ") + ",'" + sh + "','" + lxr + "','" + lxfs + "',0,0)"; + logger_c15112b8.info(String.valueOf("sql == "+sql)); } RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillAction.java index fb797bd..445c5f3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillAction.java @@ -32,6 +32,8 @@ public class EASPhoneBillAction extends BaseBean implements Action, EsbServerles @Autowired private RequestInfo requestInfoTemp; + @Autowired + private FeeApplicationService service ; private static final Logger logger_587b7053 = LoggerFactory.getLogger(EASPhoneBillAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -139,9 +141,11 @@ public class EASPhoneBillAction extends BaseBean implements Action, EsbServerles } lines[j] = line; } - FeeApplicationService service = new FeeApplicationService(); +// FeeApplicationService service = new FeeApplicationService(); param.setCostStandardLinesArr(lines); CostStandardSynchronizationServiceResponse returnData = service.call(param); + + logger_587b7053.info("returnData == " + returnData); String state = returnData.get_return().getISTAT(); String message = returnData.get_return().getMESSAGE(); if (!"1".equals(state)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillCheckAction.java index f316d93..b59f2f9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASPhoneBillCheckAction.java @@ -32,6 +32,8 @@ public class EASPhoneBillCheckAction extends BaseBean implements Action, EsbServ @Autowired private RequestInfo requestInfoTemp; + @Autowired + private FeeApplicationService service ; private static final Logger logger_1e024161 = LoggerFactory.getLogger(EASPhoneBillCheckAction.class); public WeaResult> execute(Map requestInfoMap) { @@ -139,9 +141,10 @@ public class EASPhoneBillCheckAction extends BaseBean implements Action, EsbServ } lines[j] = line; } - FeeApplicationService service = new FeeApplicationService(); +// FeeApplicationService service = new FeeApplicationService(); param.setCostStandardLinesArr(lines); CostStandardSynchronizationServiceResponse returnData = service.call(param); + logger_1e024161.info("returnData == " + returnData); String state = returnData.get_return().getISTAT(); String message = returnData.get_return().getMESSAGE(); if (!"1".equals(state)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java index c21a599..f3aad58 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASZhuSuSynAction.java @@ -1,6 +1,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.interfaces.prop.ConfigProp; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.util.HashMap; import java.util.Map; @@ -31,6 +32,9 @@ public class EASZhuSuSynAction extends BaseBean implements Action, EsbServerless @Autowired private RequestInfo requestInfoTemp; + + @Autowired + private ConfigProp configProp; private static final Logger logger_f451692d = LoggerFactory.getLogger(EASZhuSuSynAction.class); @Override @@ -113,8 +117,12 @@ public class EASZhuSuSynAction extends BaseBean implements Action, EsbServerless mJson.put("by3", ""); logger_f451692d.info("调用EAS接口请求数据：=====" + mJson.toString()); // 调用接口 - String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); - String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); +// String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.syncOaApplyForm")).trim(); +// String appKey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.easappkey")).trim(); + + String url = configProp.getSyncOaApplyForm(); + String appKey = configProp.getEasappkey(); + SendPostRequest_API mGetResult = new SendPostRequest_API(); String result = mGetResult.getResult(mJson, url, appKey); logger_f451692d.info(String.valueOf("调用EAS接口请求数据：" + result)); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_API.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_API.java index 7251370..c9ec78f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_API.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SendPostRequest_API.java @@ -21,6 +21,8 @@ public class SendPostRequest_API extends BaseBean { private static final Logger logger_8c2343 = LoggerFactory.getLogger(SendPostRequest_API.class); public String getResult(JSONObject returnJson, String url, String appKey) { + + logger_8c2343.info(String.valueOf("SendPostRequest_API getResult ")); HttpPost post = null; String result = "E"; try {