hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码从sysnew中移出

This commit is contained in:
hecan 2025-03-24 11:27:54 +08:00
parent b906b24c8e
commit e9bdda5cf0
7 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base-buildpackage/pom.xml
View File

@ -18,6 +18,11 @@
<artifactId>base-webapp</artifactId> <artifactId>base-webapp</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>com.hzya.frame</groupId>
<artifactId>fw-oa</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

9
base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankDistributePluginInitializer.java
View File

@ -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.dao.IMdmModuleSendLogDao;
import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity;
import com.hzya.frame.mdm.service.IMdmServiceCache; 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.sys.sysenum.SysEnum;
import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; 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.grovy.service.IGroovyIntegrationService;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; 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.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
@ -474,6 +474,7 @@ public class ZxBankDistributePluginInitializer extends PluginBaseEntity {
//查询主数据 //查询主数据
MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity(); MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity();
queryMdmModuleEntity.setSts("Y"); queryMdmModuleEntity.setSts("Y");
queryMdmModuleEntity.setMdmCode(Long.valueOf("10048"));
List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity); List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity);
if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){ if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){
return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发"); return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发");
@ -508,18 +509,12 @@ public class ZxBankDistributePluginInitializer extends PluginBaseEntity {
queryFildRule.setMdmId(mdmModuleEntities.get(i).getId()); queryFildRule.setMdmId(mdmModuleEntities.get(i).getId());
queryFildRule.setRuleCode("service"); queryFildRule.setRuleCode("service");
List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(queryFildRule); List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(queryFildRule);
if(mdmModuleEntities.get(i).getMdmCode()!= 10045L){
//新增 //新增
doAdd(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); doAdd(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities);
//修改 //修改
doUpdate(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); doDelete(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities);
}else{
logger.info("主数据编码为10045，已经在业务数据下发执行，主数据下发不执行");
continue;
}
} }
} }

4
base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankPluginInitializer.java
View File

@ -2,9 +2,7 @@ package com.hzya.frame.plugin.zxBank.plugin;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.plugin.masterData.plugin.MdmPluginInitializer; import com.hzya.frame.seeyon.zxbank.service.IZxBankService;
import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService;
import com.hzya.frame.sysnew.zxbank.service.IZxBankService;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
base-buildpackage/src/main/java/com/hzya/frame/plugin/zxBank/plugin/ZxBankResultPluginInitializer.java
View File

@ -2,7 +2,7 @@ package com.hzya.frame.plugin.zxBank.plugin;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity; 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 com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
base-buildpackage/src/main/resources/cfgHome/plugin/zxBank/spring/spring-buildpackage-plugin.xml
View File

@ -2,4 +2,6 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans default-autowire="byName"> <beans default-autowire="byName">
<bean name="ZxBankPluginInitializer" class="com.hzya.frame.plugin.zxBank.plugin.ZxBankPluginInitializer" /> <bean name="ZxBankPluginInitializer" class="com.hzya.frame.plugin.zxBank.plugin.ZxBankPluginInitializer" />
<bean name="ZxBankResultPluginInitializer" class="com.hzya.frame.plugin.zxBank.plugin.ZxBankResultPluginInitializer" />
<bean name="ZxBankDistributePluginInitializer" class="com.hzya.frame.plugin.zxBank.plugin.ZxBankDistributePluginInitializer" />
</beans> </beans>

4
fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml
View File

@ -85,12 +85,12 @@
<!--通过主键修改方法--> <!--通过主键修改方法-->
<update id="updatePushStatus" parameterType = "com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity" > <update id="updatePushStatus" parameterType = "com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity" >
update ${tabName} set ${pushStatusField} =#{pushStatus} where id=#{dataId} update ${tabName} set ${pushStatusField} =#{pushStatus} where id=#{id}
</update> </update>
<!--通过主键修改方法--> <!--通过主键修改方法-->
<update id="updateResultStatus" parameterType = "com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity" > <update id="updateResultStatus" parameterType = "com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity" >
update ${tabName} set ${payResultField} =#{payResult} where id=#{dataId} update ${tabName} set ${payResultField} =#{payResult} where id=#{id}
</update> </update>

34
fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl;
import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; 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.dao.IZxBankDao;
import com.hzya.frame.seeyon.zxbank.entity.PayState; import com.hzya.frame.seeyon.zxbank.entity.PayState;
import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; 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.comparison.service.impl.ComparisonServiceImpl;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService;
import com.hzya.frame.uuid.UUIDLong;
import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
@ -43,6 +45,12 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
@Value("${zt.url}") @Value("${zt.url}")
private String url; private String url;
@Value("${zx.privateKey}")
private String privateKey;
@Value("${zx.publicKey}")
private String publicKey;
@Override @Override
public JsonResultEntity queryArchives(JSONObject json) { public JsonResultEntity queryArchives(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr"); JSONObject jsonObject = json.getJSONObject("jsonStr");
@ -63,7 +71,7 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
switch (appTyp){ switch (appTyp){
case "1": case "1":
switch (mdmCode){ switch (mdmCode){
case ""://杭泰付款单 case "10048"://杭泰付款单
tableName = "mdm_zxbank"; tableName = "mdm_zxbank";
listAll = bindingZxBank(jsonObject, mdmModuleSourceEntity, dbCode); listAll = bindingZxBank(jsonObject, mdmModuleSourceEntity, dbCode);
break; break;
@ -83,7 +91,7 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
JSONObject attributeResult = (JSONObject) JSON.toJSON(obj); JSONObject attributeResult = (JSONObject) JSON.toJSON(obj);
if (attributeResult.getString("status").equals("200")) { if (attributeResult.getString("status").equals("200")) {
String resultString = attributeResult.getString("list"); String resultString = attributeResult.getString("list");
if ("".equals(mdmCode)) { if ("10048".equals(mdmCode)) {
JSONArray jsonArray = JSONArray.parseArray(resultString); JSONArray jsonArray = JSONArray.parseArray(resultString);
if (CollectionUtils.isNotEmpty(jsonArray)) { if (CollectionUtils.isNotEmpty(jsonArray)) {
for (Object o : jsonArray) { for (Object o : jsonArray) {
@ -128,7 +136,7 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
try { try {
JSONObject jsonObject = json.getJSONObject("jsonStr"); JSONObject jsonObject = json.getJSONObject("jsonStr");
ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class); ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class);
zxBankEntity.setDataSourceCode(""); zxBankEntity.setDataSourceCode("HT-OA");
logger.info("======开始查询中信返回的支付结果====="); logger.info("======开始查询中信返回的支付结果=====");
List<ZxBankEntity> zxBankEntities = zxBankDao.queryResultIsNull(zxBankEntity); List<ZxBankEntity> zxBankEntities = zxBankDao.queryResultIsNull(zxBankEntity);
if(CollectionUtils.isEmpty(zxBankEntities)){ if(CollectionUtils.isEmpty(zxBankEntities)){
@ -142,11 +150,11 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
logger.info("=======杭泰付款单调用中信支付结果查询请求参数为:{}", params); logger.info("=======杭泰付款单调用中信支付结果查询请求参数为:{}", params);
//发送数据 //发送数据
String result = HttpRequest.post(url). String result = HttpRequest.post(url).
header("appId", ""). header("appId", "800058").
header("apiCode", ""). header("apiCode", "8000580001").
//header("access_token", tokenBody). //header("access_token", tokenBody).
header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). header("publicKey", "ZJYALA1PchEI1s2D5vaapO9RZ6CiDFv/pJAV88lRYg0oBwBCe7eDIk+3zDUT+v578prj").
header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). header("secretKey", "jcoATYyty05KgDwL4O0xD+Ulq5ExYWkGvZGf2bhKrMaCehb3NIm5DUnJSK/r2SUaj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
body(params). body(params).
execute(). execute().
body(); body();
@ -191,7 +199,7 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
try { try {
JSONObject jsonObject = json.getJSONObject("jsonStr"); JSONObject jsonObject = json.getJSONObject("jsonStr");
ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class); ZxBankEntity zxBankEntity = jsonObject.toJavaObject(ZxBankEntity.class);
zxBankEntity.setDataSourceCode(""); zxBankEntity.setDataSourceCode("HT-OA");
logger.info("======开始查询中信电子回单====="); logger.info("======开始查询中信电子回单=====");
List<ZxBankEntity> zxBankEntities = zxBankDao.queryElecIsNull(zxBankEntity); List<ZxBankEntity> zxBankEntities = zxBankDao.queryElecIsNull(zxBankEntity);
if(CollectionUtils.isEmpty(zxBankEntities)){ if(CollectionUtils.isEmpty(zxBankEntities)){
@ -206,11 +214,11 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
logger.info("======杭泰付款单调用中信电子回单查询请求参数为:{}========",params); logger.info("======杭泰付款单调用中信电子回单查询请求参数为:{}========",params);
//发送数据 //发送数据
String result = HttpRequest.post(url). String result = HttpRequest.post(url).
header("appId", ""). header("appId", "800058").
header("apiCode", ""). header("apiCode", "8000580002").
//header("access_token", tokenBody). //header("access_token", tokenBody).
header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). header("publicKey", "ZJYALA1PchEI1s2D5vaapO9RZ6CiDFv/pJAV88lRYg0oBwBCe7eDIk+3zDUT+v578prj").
header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). header("secretKey", "jcoATYyty05KgDwL4O0xD+Ulq5ExYWkGvZGf2bhKrMaCehb3NIm5DUnJSK/r2SUaj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
body(params). body(params).
execute(). execute().
body(); body();
@ -263,7 +271,7 @@ public class ZxBankServiceImpl extends BaseService<ZxBankEntity, String> impleme
private List<JSONObject> bindingZxBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) { private List<JSONObject> bindingZxBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) {
List<JSONObject> list = new ArrayList<>(); List<JSONObject> list = new ArrayList<>();
StringBuffer stringBuffer = new StringBuffer(); 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); mdmModuleSourceEntity.setDataSourceCode(dbCode);
List<HashMap<String, Object>> hashMaps = zxBankDao.queryListByBank(stringBuffer.toString(), mdmModuleSourceEntity); List<HashMap<String, Object>> hashMaps = zxBankDao.queryListByBank(stringBuffer.toString(), mdmModuleSourceEntity);
int i = 0; int i = 0;