From e9bdda5cf07121a7bb3586680b8fa8c289500397 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 24 Mar 2025 11:27:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BB=8Esysnew=E4=B8=AD?= =?UTF-8?q?=E7=A7=BB=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-buildpackage/pom.xml | 5 +++ .../ZxBankDistributePluginInitializer.java | 9 ++--- .../plugin/ZxBankPluginInitializer.java | 4 +-- .../plugin/ZxBankResultPluginInitializer.java | 2 +- .../spring/spring-buildpackage-plugin.xml | 2 ++ .../seeyon/zxbank/entity/ZxBankEntity.xml | 4 +-- .../service/impl/ZxBankServiceImpl.java | 34 ++++++++++++------- 7 files changed, 34 insertions(+), 26 deletions(-) diff --git a/base-buildpackage/pom.xml b/base-buildpackage/pom.xml index f4f9b259..c5ae48c4 100644 --- a/base-buildpackage/pom.xml +++ b/base-buildpackage/pom.xml @@ -18,6 +18,11 @@ base-webapp ${revision} + + com.hzya.frame + fw-oa + 0.0.1-SNAPSHOT + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankDistributePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankDistributePluginInitializer.java index 7ace1f25..32edad78 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankDistributePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankDistributePluginInitializer.java @@ -21,6 +21,7 @@ import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistribu import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; import com.hzya.frame.mdm.service.IMdmServiceCache; +import com.hzya.frame.seeyon.zxbank.service.IZxBankService; import com.hzya.frame.sys.sysenum.SysEnum; import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; @@ -31,7 +32,6 @@ import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntit import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; -import com.hzya.frame.sysnew.zxbank.service.IZxBankService; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -474,6 +474,7 @@ public class ZxBankDistributePluginInitializer extends PluginBaseEntity { //查询主数据 MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity(); queryMdmModuleEntity.setSts("Y"); + queryMdmModuleEntity.setMdmCode(Long.valueOf("10048")); List mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity); if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){ return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发"); @@ -508,18 +509,12 @@ public class ZxBankDistributePluginInitializer extends PluginBaseEntity { queryFildRule.setMdmId(mdmModuleEntities.get(i).getId()); queryFildRule.setRuleCode("service"); List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(queryFildRule); - - if(mdmModuleEntities.get(i).getMdmCode()!= 10045L){ //新增 doAdd(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); //修改 doUpdate(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); //删除 doDelete(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); - }else{ - logger.info("主数据编码为10045，已经在业务数据下发执行，主数据下发不执行"); - continue; - } } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankPluginInitializer.java index 2eb03f95..65d0c3fc 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankPluginInitializer.java @@ -2,9 +2,7 @@ package com.hzya.frame.plugin.zxBank.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.plugin.masterData.plugin.MdmPluginInitializer; -import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService; -import com.hzya.frame.sysnew.zxbank.service.IZxBankService; +import com.hzya.frame.seeyon.zxbank.service.IZxBankService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankResultPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankResultPluginInitializer.java index 9a9c901a..399e1989 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankResultPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankResultPluginInitializer.java @@ -2,7 +2,7 @@ package com.hzya.frame.plugin.zxBank.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sysnew.zxbank.service.IZxBankService; +import com.hzya.frame.seeyon.zxbank.service.IZxBankService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/zxBank/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/zxBank/spring/spring-buildpackage-plugin.xml index ca361062..cb28c7ce 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/zxBank/spring/spring-buildpackage-plugin.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/zxBank/spring/spring-buildpackage-plugin.xml @@ -2,4 +2,6 @@ + + diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml index 0f53c4e9..4087d5c5 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml @@ -85,12 +85,12 @@ - update ${tabName} set ${pushStatusField} =#{pushStatus} where id=#{dataId} + update ${tabName} set ${pushStatusField} =#{pushStatus} where id=#{id} - update ${tabName} set ${payResultField} =#{payResult} where id=#{dataId} + update ${tabName} set ${payResultField} =#{payResult} where id=#{id} diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java index 4057b6ef..9cb5bcc7 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.seeyon.util.SM2Util; import com.hzya.frame.seeyon.zxbank.dao.IZxBankDao; import com.hzya.frame.seeyon.zxbank.entity.PayState; import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; @@ -15,6 +16,7 @@ import com.hzya.frame.seeyon.zxbank.service.IZxBankService; import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.uuid.UUIDLong; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -43,6 +45,12 @@ public class ZxBankServiceImpl extends BaseService impleme @Value("${zt.url}") private String url; + + @Value("${zx.privateKey}") + private String privateKey; + + @Value("${zx.publicKey}") + private String publicKey; @Override public JsonResultEntity queryArchives(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -63,7 +71,7 @@ public class ZxBankServiceImpl extends BaseService impleme switch (appTyp){ case "1": switch (mdmCode){ - case ""://杭泰付款单 + case "10048"://杭泰付款单 tableName = "mdm_zxbank"; listAll = bindingZxBank(jsonObject, mdmModuleSourceEntity, dbCode); break; @@ -83,7 +91,7 @@ public class ZxBankServiceImpl extends BaseService impleme JSONObject attributeResult = (JSONObject) JSON.toJSON(obj); if (attributeResult.getString("status").equals("200")) { String resultString = attributeResult.getString("list"); - if ("".equals(mdmCode)) { + if ("10048".equals(mdmCode)) { JSONArray jsonArray = JSONArray.parseArray(resultString); if (CollectionUtils.isNotEmpty(jsonArray)) { for (Object o : jsonArray) { @@ -128,7 +136,7 @@ public class ZxBankServiceImpl extends BaseService impleme try { JSONObject jsonObject = json.getJSONObject("jsonStr"); ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class); - zxBankEntity.setDataSourceCode(""); + zxBankEntity.setDataSourceCode("HT-OA"); logger.info("======开始查询中信返回的支付结果====="); List zxBankEntities = zxBankDao.queryResultIsNull(zxBankEntity); if(CollectionUtils.isEmpty(zxBankEntities)){ @@ -142,11 +150,11 @@ public class ZxBankServiceImpl extends BaseService impleme logger.info("=======杭泰付款单调用中信支付结果查询请求参数为:{}", params); //发送数据 String result = HttpRequest.post(url). - header("appId", ""). - header("apiCode", ""). + header("appId", "800058"). + header("apiCode", "8000580001"). //header("access_token", tokenBody). - header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). - header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + header("publicKey", "ZJYALA1PchEI1s2D5vaapO9RZ6CiDFv/pJAV88lRYg0oBwBCe7eDIk+3zDUT+v578prj"). + header("secretKey", "jcoATYyty05KgDwL4O0xD+Ulq5ExYWkGvZGf2bhKrMaCehb3NIm5DUnJSK/r2SUaj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). body(params). execute(). body(); @@ -191,7 +199,7 @@ public class ZxBankServiceImpl extends BaseService impleme try { JSONObject jsonObject = json.getJSONObject("jsonStr"); ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class); - zxBankEntity.setDataSourceCode(""); + zxBankEntity.setDataSourceCode("HT-OA"); logger.info("======开始查询中信电子回单====="); List zxBankEntities = zxBankDao.queryElecIsNull(zxBankEntity); if(CollectionUtils.isEmpty(zxBankEntities)){ @@ -206,11 +214,11 @@ public class ZxBankServiceImpl extends BaseService impleme logger.info("======杭泰付款单调用中信电子回单查询请求参数为:{}========",params); //发送数据 String result = HttpRequest.post(url). - header("appId", ""). - header("apiCode", ""). + header("appId", "800058"). + header("apiCode", "8000580002"). //header("access_token", tokenBody). - header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). - header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + header("publicKey", "ZJYALA1PchEI1s2D5vaapO9RZ6CiDFv/pJAV88lRYg0oBwBCe7eDIk+3zDUT+v578prj"). + header("secretKey", "jcoATYyty05KgDwL4O0xD+Ulq5ExYWkGvZGf2bhKrMaCehb3NIm5DUnJSK/r2SUaj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). body(params). execute(). body(); @@ -263,7 +271,7 @@ public class ZxBankServiceImpl extends BaseService impleme private List bindingZxBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) { List list = new ArrayList<>(); StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select * from v_hzya_pay where 1=1 and pushStatus is null "); + stringBuffer.append("select * from v_hzya_pay where 1=1 and push_status is null "); mdmModuleSourceEntity.setDataSourceCode(dbCode); List> hashMaps = zxBankDao.queryListByBank(stringBuffer.toString(), mdmModuleSourceEntity); int i = 0;