diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java index 685cef93..e51e66c8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java @@ -3,6 +3,7 @@ package com.hzya.frame.plugin.cbs8.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,6 +97,6 @@ public class ElecBillPluginInitializer extends PluginBaseEntity { @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { cbsPluginService.elecBillUpload(requestJson); - return null; + return BaseResult.getSuccessMessageEntity("cbs8电子回单插件执行成功"); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java index d013e070..0f802dc8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java @@ -1,9 +1,13 @@ package com.hzya.frame.plugin.cbs8.plugin; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +23,8 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { @Autowired private ICbsPluginService cbsPluginService; - + @Autowired + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; /*** * 插件初始化方法 * @Author 👻👻👻👻👻👻👻👻 gjh @@ -102,11 +107,26 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { requestJson.remove("jsonStr"); paymentEntity = JSONObject.parseObject(requestJson.toString(),PaymentEntity.class); } - if (null == paymentEntity) + if (null == paymentEntity){ paymentEntity = new PaymentEntity(); + } + String taskDetailId = requestJson.getString("integration_task_living_details_id"); + if (StrUtil.isNotEmpty(taskDetailId)){ + //查询日志里的参数 + //查询日志表 + IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(taskDetailId); + if (null != taskDetailEntity){ + //重试标记 + paymentEntity.setRetryFlag("1"); + paymentEntity.setReferenceNum(taskDetailEntity.getRootAppBill()); + paymentEntity.setTaskDetailId(taskDetailId); + }else { + return BaseResult.getFailureMessageEntity("根据id:{}，查不到记录",taskDetailId); + } + } //支付申请 - //paymentEntity.setOaId("8475071606892874568"); + //paymentEntity.setOaId("-5026223055769156433"); cbsPluginService.applyPay(paymentEntity); - return null; + return BaseResult.getSuccessMessageEntity("cbs8支付申请插件执行完成"); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java index de84e734..23a87f8b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java @@ -7,6 +7,7 @@ import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,7 +121,6 @@ public class TransactionDetailPluginInitializer extends PluginBaseEntity { List transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO); //保存交易明细到OA底表 cbsPluginService.saveTransactionDetail(transactionDetailList); - return new JsonResultEntity("成功",true,transactionDetailList); - //return null; + return BaseResult.getSuccessMessageEntity("成功",transactionDetailList); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java index 81d79be3..9d3b23d0 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java @@ -84,6 +84,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { if (CollectionUtils.isNotEmpty(paymentList)){ for (PaymentEntity pay : paymentList) { //调用支付申请接口 + pay.setTaskDetailId(paymentEntity.getTaskDetailId()); + if (StrUtil.isNotEmpty(paymentEntity.getTaskDetailId())){ + pay.setReferenceNumNew(spliceBillCode(pay.getReferenceNum())); + } PayResponseDTO payResponseDTO = cbs8Service.payApply(pay); boolean successed = payResponseDTO.getSuccessed(); if (successed){ @@ -209,10 +213,11 @@ public class CbsPluginServiceImpl implements ICbsPluginService { public void elecBillUpload(JSONObject requestJson) throws Exception { //查询支付成功 没有电子回单的数据 PaymentEntity paymentEntity = new PaymentEntity(); - // List paymentList = paymentService.queryElecIsNull(paymentEntity); - paymentEntity.setPayDate("2024-06-20"); - paymentEntity.setReferenceNum("41"); - List paymentList = Arrays.asList(paymentEntity); + paymentEntity.setDataSourceCode(oa_data_source_code); + List paymentList = paymentService.queryElecIsNull(paymentEntity); + //paymentEntity.setPayDate("2024-06-20"); + //paymentEntity.setReferenceNum("41"); + //List paymentList = Arrays.asList(paymentEntity); if (CollectionUtils.isNotEmpty(paymentList)) { for (PaymentEntity pay : paymentList) { try { @@ -312,8 +317,9 @@ public class CbsPluginServiceImpl implements ICbsPluginService { PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detail,PaymentApplyAgentDTO.class); paymentApplyAgentList.add(detailDTO); } - //招行这里要传203 - paymentApplySubmitReqDTO.setBankExtend5("203"); + + //不同银行添加 处理不一样 + //addAttribute(agentPay,paymentApplySubmitReqDTO,paymentApplyAgentList); PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); if (null != payResponseDTO){ Boolean successed = payResponseDTO.getSuccessed(); @@ -341,6 +347,65 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } } + /** + * 不同银行设置不同的字段 + * @param agentPay + * @param paymentApplySubmitReqDTO 表头 + * @param list 表体 + */ + private void addAttribute(AgentPaymentEntity agentPay, PaymentApplySubmitReqDTO paymentApplySubmitReqDTO,List list) { + + //招商 CMB + //代发类型 + paymentApplySubmitReqDTO.setBankExtend5("203"); + + + //浦东发展银行 PDB + paymentApplySubmitReqDTO.setPersonalFlag("1"); + //代发类型 + paymentApplySubmitReqDTO.setBankExtend5("203"); + //单位编号 + paymentApplySubmitReqDTO.setBankExtend6("203"); + //代发信息 1002表示代发工资 + paymentApplySubmitReqDTO.setBankExtend8("1002"); + + //民生银行 CMC + //1表示代发工资 + paymentApplySubmitReqDTO.setBankExtend5("1"); + + //农业银行 ABC + //200表示同行代发工资 + paymentApplySubmitReqDTO.setBankExtend2("200"); + //99020001表示工资发放 + paymentApplySubmitReqDTO.setBankExtend8("99020001"); + + //光大银行 CEB + paymentApplySubmitReqDTO.setBankExtend1("00000000"); + paymentApplySubmitReqDTO.setBankExtend8("0"); + //证件号，不知道填什么 + for (PaymentApplyAgentDTO paymentApplyAgentDTO : list) { + paymentApplyAgentDTO.setDtlExtend1(""); + } + + //民生银行 + //付款类型 1代表代发工资 + paymentApplySubmitReqDTO.setBankExtend5("1"); + + //工商银行 + paymentApplySubmitReqDTO.setUrgentTag("0"); + + //广发银行 + //3表示代发工资 + paymentApplySubmitReqDTO.setBankExtend2("3"); + + //华夏银行 + paymentApplySubmitReqDTO.setBankExtend1("0"); + // xhj3001表示代发工资 + paymentApplySubmitReqDTO.setBankExtend2("xhj3001"); + + + } + /** * 代发代扣 结果详情查询 * @@ -495,4 +560,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } } + //拼接新的单据号 + private String spliceBillCode(String code){ + String hour = Convert.toStr(DateUtil.hour(new Date(),true)); + String minute = Convert.toStr(DateUtil.minute(new Date())); + return code+"-"+hour+minute; + } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index 68f31657..3657beac 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -17,6 +17,8 @@ import com.hzya.frame.mdm.mdmModuleDistribute.dao.IMdmModuleDistributeDao; import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; import com.hzya.frame.mdm.mdmModuleDistributeDetail.dao.IMdmModuleDistributeDetailDao; import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao.IMdmModuleDistributeTripartiteDao; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; import com.hzya.frame.mdm.service.IMdmServiceCache; @@ -79,7 +81,8 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { private IMdmServiceCache mdmServiceCache; @Resource private IMdmModuleSendLogDao mdmModuleSendLogDao; - + @Resource + private IMdmModuleDistributeTripartiteDao mdmModuleDistributeTripartiteDao; @Value("${zt.url}") private String url ; @@ -342,6 +345,21 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { parameterJson.put("body",apiEntity.getBodyIn()); parameterJson.put("query",apiEntity.getQueryIn()); parameterJson.put("data",object); + + if (!"1".equals(type)) {//删除或者修改情况,查询三方id，有就设置，没有就设置空 + //1、根据主数据id、数据id、应用ID默认查询主数据应用下发三方id表，只查询最新的一条数据 + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setSts("Y"); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDistributeTripartiteEntity.setDataId(object.getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity); + String tripartiteId = ""; + if(mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null ){ + tripartiteId = mdmModuleDistributeTripartiteEntity.getTripartiteId(); + } + parameterJson.put("tripartiteId", tripartiteId); + } /** head */ Map header = null; /** query */ @@ -399,7 +417,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { return BaseResult.getFailureMessageEntity("发送错误:"+rzjsonResultEntity.getMsg()); } JSONObject attritube = JSONObject.parseObject(rzjsonResultEntity.getAttribute().toString()); - logger.info("认证接口返回信息："+ attritube.toJSONString()); + logger.info("认证接口返回信息："+ attritube.toJSONString()); querys = getQuery(apiEntity,querys,attritube); headers = getHeaders(apiEntity,headers,attritube); @@ -408,6 +426,39 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { //组装数据发送 JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,bodys,querys); if(jsonResultEntity.isFlag()){ + if ("1".equals(type)) {//保存三方返回id + if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null ) { + JSONObject backScriptJson = new JSONObject(); + backScriptJson.put("data", jsonResultEntity.getAttribute()); + groovy.put("code", scriptEntity.getScriptCode()+"back"); + groovy.put("className", scriptEntity.getClassName()+"back"); + groovy.put("name", scriptEntity.getScriptName()+"back"); + groovy.put("methodStr", scriptEntity.getBackScriptData()); + groovy.put("parameterJson", backScriptJson); + JSONObject groovyStr = new JSONObject(); + groovyStr.put("jsonStr", groovy); + try { + Object str = groovyIntegrationService.groovyScriptExecution(groovyStr); + if(str != null){ + JSONObject backJsonResultEntity = JSONObject.parseObject(str.toString()); + if(backJsonResultEntity != null && backJsonResultEntity.getString("success") != null && "true".equals(backJsonResultEntity.getString("success"))){ + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setCreate(); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDistributeTripartiteEntity.setDataId(object.getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity.setTripartiteId(backJsonResultEntity.getString("tripartiteId")); + mdmModuleDistributeTripartiteDao.save(mdmModuleDistributeTripartiteEntity); + } + } + } catch (Exception e) { + logger.error("新增返回脚本解析保存三方id错误"+jsonResultEntity.getAttribute()); + taskDetailEntity.setResult("新增返回脚本解析保存三方id错误"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("发送错误"); + } + } + } taskDetailEntity.setResult("发送成功"); taskLivingDetailsService.saveLogFailToSuccess(taskDetailEntity); return BaseResult.getFailureMessageEntity("发送成功"); @@ -422,6 +473,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { //查询主数据 MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity(); queryMdmModuleEntity.setSts("Y"); + queryMdmModuleEntity.setMdmCode(10004L); List mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity); if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){ return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发"); @@ -458,11 +510,11 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(queryFildRule); //新增 - doAdd(mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); + doAdd(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); //修改 - //doUpdate(mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); + doUpdate(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); //删除 - //doDelete(mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); + doDelete(mdmModuleEntities.get(i).getId(),mdmCode,mdmModuleDbEntities,mdmModuleDistributeEntities,mdmModuleDbFiledsRuleEntities,mdmModuleDbFiledsEntities); } @@ -476,7 +528,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { return BaseResult.getSuccessMessageEntity("执行成功"); } - private void doDelete(Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities, List mdmModuleDbFiledsRuleEntities, List mdmModuleDbFiledsEntities) throws Exception { + private void doDelete(String mdmId,Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities, List mdmModuleDbFiledsRuleEntities, List mdmModuleDbFiledsEntities) throws Exception { //查询一千条数据 String mainDb = null; List objects = new ArrayList<>(); @@ -573,6 +625,20 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { parameterJson.put("body",apiEntity.getBodyIn()); parameterJson.put("query",apiEntity.getQueryIn()); parameterJson.put("data",doObjects.get(i)); + + //1、根据主数据id、数据id、应用ID默认查询主数据应用下发三方id表，只查询最新的一条数据 + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setSts("Y"); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmId); + mdmModuleDistributeTripartiteEntity.setDataId(objects.get(i).getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity); + String tripartiteId = ""; + if(mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null ){ + tripartiteId = mdmModuleDistributeTripartiteEntity.getTripartiteId(); + } + parameterJson.put("tripartiteId", tripartiteId); + /** head */ Map header = null; /** query */ @@ -657,7 +723,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { } } - private void doUpdate(Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities, List mdmModuleDbFiledsRuleEntities, List mdmModuleDbFiledsEntities) throws Exception { + private void doUpdate(String mdmId,Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities, List mdmModuleDbFiledsRuleEntities, List mdmModuleDbFiledsEntities) throws Exception { //查询一千条数据 String mainDb = null; List objects = new ArrayList<>(); @@ -742,6 +808,18 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { parameterJson.put("body",apiEntity.getBodyIn()); parameterJson.put("query",apiEntity.getQueryIn()); parameterJson.put("data",doObjects.get(i)); + //1、根据主数据id、数据id、应用ID默认查询主数据应用下发三方id表，只查询最新的一条数据 + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setSts("Y"); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmId); + mdmModuleDistributeTripartiteEntity.setDataId(objects.get(i).getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity); + String tripartiteId = ""; + if(mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null ){ + tripartiteId = mdmModuleDistributeTripartiteEntity.getTripartiteId(); + } + parameterJson.put("tripartiteId", tripartiteId); /** head */ Map header = null; /** query */ @@ -833,7 +911,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { * @param mdmModuleDistributeEntities * @return void **/ - private void doAdd(Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities,List mdmModuleDbFiledsRuleEntities,List mdmModuleDbFiledsEntities ) throws Exception { + private void doAdd(String mdmId,Long mainCode,List mdmModuleDbEntities, List mdmModuleDistributeEntities,List mdmModuleDbFiledsRuleEntities,List mdmModuleDbFiledsEntities ) throws Exception { //查询一千条数据 String mainDb = null; List objects = new ArrayList<>(); @@ -993,6 +1071,43 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { //组装数据发送 JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,bodys,querys); if(jsonResultEntity.isFlag()){ + if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null ) { + JSONObject backScriptJson = new JSONObject(); + backScriptJson.put("data", jsonResultEntity.getAttribute()); + groovy.put("code", scriptEntity.getScriptCode()+"back"); + groovy.put("className", scriptEntity.getClassName()+"back"); + groovy.put("name", scriptEntity.getScriptName()+"back"); + groovy.put("methodStr", scriptEntity.getBackScriptData()); + groovy.put("parameterJson", backScriptJson); + JSONObject groovyStr = new JSONObject(); + groovyStr.put("jsonStr", groovy); + try { + Object str = groovyIntegrationService.groovyScriptExecution(groovyStr); + if(str != null){ + JSONObject backJsonResultEntity = JSONObject.parseObject(str.toString()); + if(backJsonResultEntity != null && backJsonResultEntity.getString("success") != null && "true".equals(backJsonResultEntity.getString("success"))){ + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setId(UUIDUtils.getUUID()); + mdmModuleDistributeTripartiteEntity.setSts("Y"); + mdmModuleDistributeTripartiteEntity.setCreate_user_id("1"); + mdmModuleDistributeTripartiteEntity.setModify_user_id("1"); + mdmModuleDistributeTripartiteEntity.setCreate_time(new Date()); + mdmModuleDistributeTripartiteEntity.setModify_time(new Date()); + mdmModuleDistributeTripartiteEntity.setOrg_id("0"); + mdmModuleDistributeTripartiteEntity.setCompanyId("0"); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmId); + mdmModuleDistributeTripartiteEntity.setDataId(objects.get(i).getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity.setTripartiteId(backJsonResultEntity.getString("tripartiteId")); + mdmModuleDistributeTripartiteDao.save(mdmModuleDistributeTripartiteEntity); + } + } + } catch (Exception e) { + logger.error("新增返回脚本解析保存三方id错误"+jsonResultEntity.getAttribute()); + saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","新增返回脚本解析保存三方id错误",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); + continue; + } + } //保存日志 saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"1","发送成功",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); continue; diff --git a/buildpackage/src/main/resources/application-dev.yml b/buildpackage/src/main/resources/application-dev.yml index 0fb81b29..dd3ebce1 100644 --- a/buildpackage/src/main/resources/application-dev.yml +++ b/buildpackage/src/main/resources/application-dev.yml @@ -12,7 +12,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true username: root password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml index 4d3c35d1..3cf8ba03 100644 --- a/buildpackage/src/main/resources/application-llg.yml +++ b/buildpackage/src/main/resources/application-llg.yml @@ -22,15 +22,15 @@ spring: # password: 62e4295b615a30dbf3b8ee96f41c820b # driver-class-name: dm.jdbc.driver.DmDriver # type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true - username: root - password: 62e4295b615a30dbf3b8ee96f41c820b - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 -# url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 -# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: hzyazt +# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root # password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: dm.jdbc.driver.DmDriver +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +# url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 + url: jdbc:dm://ufidahz.com.cn:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle + username: hzyazt + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: dm.jdbc.driver.DmDriver savefile: # 文件保存路径 path: /Users/apple/Desktop/log/local diff --git a/buildpackage/src/main/resources/application-xel.yml b/buildpackage/src/main/resources/application-xel.yml index 13b3782c..c295f664 100644 --- a/buildpackage/src/main/resources/application-xel.yml +++ b/buildpackage/src/main/resources/application-xel.yml @@ -12,7 +12,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true username: root password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index 1f564c28..19b59c47 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -122,3 +122,5 @@ jeecg : minio_name: ?? minio_pass: ?? bucketName: ?? +data: + use: true \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/temButtom.java b/buildpackage/src/test/java/com/hzya/frame/temButtom.java index e59468ee..ba7afca5 100644 --- a/buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -57,6 +57,42 @@ public class temButtom { @Autowired private PayResultPluginInitializer payResultPluginInitializer; + @Test + public void payApplyExtTest(){ + String bodys = "{\n" + + " \"amount\": \"12000\",\n" + + " \"applyCodeField\": \"field0086\",\n" + + " \"billName\": \"资金使用审批表(其他)\",\n" + + " \"busType\": \"202\",\n" + + " \"cnapsCode\": \"00031342444\",\n" + + " \"currency\": \"10\",\n" + + " \"dataSourceCode\": \"master\",\n" + + " \"finishedflag\": \"1\",\n" + + " \"formsonId\": \"8364887433640955440\",\n" + + " \"oaId\": \"-4951125123923096260\",\n" + + " \"payAccount\": \"8110801013602348528\",\n" + + " \"payBankName\": \"中信银行绍兴分行\",\n" + + " \"payCompany\": \"绍兴市越城区建设投资有限公司\",\n" + + " \"payDateField\": \"field0070\",\n" + + " \"payResultField\": \"field0069\",\n" + + " \"personalFlag\": \"0\",\n" + + " \"receipt\": \"\",\n" + + " \"receiptFiled\": \"\",\n" + + " \"referenceNum\": \"ZJSY202407030002-1\",\n" + + " \"revAccount\": \"7122459925896517\",\n" + + " \"revAccountName\": \"越城区人民医院\",\n" + + " \"revBankName\": \"中国农业银行绍兴支行\",\n" + + " \"sort\": \"1\",\n" + + " \"startDate\": \"2024-07-03 11:34:29.999000\",\n" + + " \"summaryId\": \"7384107412543258850\",\n" + + " \"tableName\": \"formson_0222\",\n" + + " \"title\": \"《资金使用审批表》-ZJSY202407030002\"\n" + + "}"; + SysExtensionApiEntity api = new SysExtensionApiEntity(); + api.setBodys(bodys); + cbs8ExtService.payApply(api); + System.out.println("111"); + } @Test public void cbs8PluginTest(){ try { @@ -100,15 +136,15 @@ public class temButtom { @Test public void cbs8ExtTest(){ PaymentEntity paymentEntity = new PaymentEntity(); - paymentEntity.setReferenceNum("CL202406140003"); + paymentEntity.setReferenceNum("ZJSY202407030002-1"); paymentEntity.setPayAccount("655905707410000"); paymentEntity.setPayBankName(""); - paymentEntity.setAmount("99.02"); - paymentEntity.setRevAccount("123456778"); - paymentEntity.setRevBankName("中国工商银行总行清算中心"); + paymentEntity.setAmount("12000"); + paymentEntity.setRevAccount("7122459925896517"); + paymentEntity.setRevBankName("中国农业银行绍兴支行"); paymentEntity.setRevBankType("ICB"); paymentEntity.setRevAccountName("测试账户"); - paymentEntity.setCnapsCode("102100099996"); + paymentEntity.setCnapsCode("00031342444"); paymentEntity.setPurpose("测试用途"); paymentEntity.setBusType("202"); paymentEntity.setCurrency("10"); diff --git a/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java b/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java index b034c049..36a5c0df 100644 --- a/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java +++ b/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java @@ -12,7 +12,7 @@ public class DataSourceUtilProperties { public static final String MYSQLDRIVER_6 = "com.mysql.jdbc.Driver"; // mysql数据库的驱动类 public static final String MYSQLDRIVER = "com.mysql.jdbc.Driver"; // mysql数据库的驱动类 public static final String ORACLEDRIVER = "oracle.jdbc.OracleDriver"; // oracles数据库的驱动类 - public static final String SQL2005DRIVER = "net.sourceforge.jtds.jdbc.Driver"; // sqlserver数据库的驱动类 + public static final String SQL2005DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; // sqlserver数据库的驱动类 public static final String SQL2000DRIVER = "net.sourceforge.jtds.jdbc.Driver"; // sqlserver数据库的驱动类 public static final String dm = "dm.jdbc.driver.DmDriver"; // 达梦数据库的驱动类 diff --git a/pom.xml b/pom.xml index afe24610..f79cb72d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ 1.8 4.12 2.0.33 - 2.7.4 - 2.7.4 + 2.7.18 + 2.7.18 3.9.1 2.8.5 3.3.0 @@ -35,7 +35,7 @@ 5.1.49 1.4.6 - 2.7.4 + 2.7.18 1.30.0 3.13.0 2.6 @@ -53,9 +53,9 @@ 11.2.0.4 3.5.2 1.2.18 - 2.7.4 - 2.7.4 - 2.7.4 + 2.7.18 + 2.7.18 + 2.7.18 4.12 2.3.0 5.3.23 @@ -68,7 +68,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.4 + 2.7.18 @@ -275,6 +275,11 @@ ${lombok.version} true + + com.microsoft.sqlserver + mssql-jdbc + 6.4.0.jre8 + @@ -403,7 +408,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.7.4 + 2.7.18 ${project.artifactId} none @@ -411,6 +416,32 @@ true + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + true + + + + org.apache.maven.plugins + maven-war-plugin + + + + ${basedir}/../service/src/main/resources/lib + WEB-INF/lib/ + false + + + **/*.jar + + + + + diff --git a/service/pom.xml b/service/pom.xml index 0a7f3138..6287f4e7 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -26,14 +26,14 @@ pubbaseapp_nccloud_rtLevel 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar + ${basedir}/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar com.hzya.bipyonyoulog yonyoulog 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/yonyoulog.jar + ${basedir}/src/main/resources/lib/yonyoulog.jar @@ -41,7 +41,7 @@ bcprov 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar + ${basedir}/src/main/resources/lib/bcprov-jdk15on-1.70.jar @@ -49,7 +49,14 @@ DataApiSdk 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar + ${basedir}/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar + + + com.hzya.openBasicSDK + openBasicSDK + 1 + system + ${basedir}/src/main/resources/lib/openBasicSDK-2.1.230630.jar diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index 2a82f8e6..f993438d 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -45,7 +45,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { @Override public SysExtensionApiEntity payApply(SysExtensionApiEntity entity) { String bodys = entity.getBodys(); - logger.info("Cbs8ExtServiceImpl.payApply方法body参数:{}",bodys); if (StrUtil.isNotEmpty(bodys)) { PaymentEntity paymentEntity = JSONObject.parseObject(bodys, PaymentEntity.class); if (null != paymentEntity) { @@ -73,10 +72,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { String requestData = JSONObject.toJSONString(list); //加密 签名 encrypAndsign(entity, requestData); + //重试日志id + entity.getHeaders().put("integration_task_living_details_id",paymentEntity.getTaskDetailId()); entity.setBodys(requestData); } } - logger.info("Cbs8ExtServiceImpl.payApply方法执行完毕:{}",JSONObject.toJSONString(entity)); return entity; } @@ -96,26 +96,41 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { JSONObject sourceBody = sourceData.getJSONObject("body");//源数据body //自定义参数，存放的是请求报文明文 String hzyaExtData = targetHeaders.getString("hzyaExtData"); + String taskDetailId = targetHeaders.getString("integration_task_living_details_id"); String returnDataBase64 = logEntity.getReturnData(); byte[] secretResByte = Base64.getDecoder().decode(returnDataBase64); //解密报文 String decryptRes = CBSUtil.decrypt(secretResByte); //6、记录系统日志 IntegrationTaskLivingDetailsEntity logTask = new IntegrationTaskLivingDetailsEntity(); - logTask.setRootAppPk(sourceBody.getString("formsonId")); - logTask.setRootAppBill(sourceBody.getString("referenceNum")); + logTask.setRootAppPk(sourceBody.getString("oaId")); + String ferenceNum = Convert.toStr(sourceBody.getString("referenceNumNew"), sourceBody.getString("referenceNum")); + logTask.setRootAppBill(ferenceNum); logTask.setPluginId("CBS8PayApplyPlugin"); //对方接口返回信息 logTask.setNewTransmitInfo(decryptRes); - logTask.setNewPushDate(new Date()); + Date date = new Date(); + logTask.setNewPushDate(date); //调用接口请求参数 logTask.setRootAppNewData(hzyaExtData); PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(decryptRes); - //为true是成功 - if (payResponseDTO.getSuccessed()) { - taskLivingDetailsService.saveLogToSuccess(logTask); + if (StrUtil.isEmpty(taskDetailId)){ + logTask.setCreate_time(date); + logTask.setModify_time(date); + //为true是成功 + if (payResponseDTO.getSuccessed()) { + taskLivingDetailsService.saveLogToSuccess(logTask); + }else { + taskLivingDetailsService.saveLogToFail(logTask); + } }else { - taskLivingDetailsService.saveLogToFail(logTask); + logTask.setId(taskDetailId); + logTask.setModify_time(date); + if (payResponseDTO.getSuccessed()){ + taskLivingDetailsService.saveLogFailToSuccess(logTask); + }else { + taskLivingDetailsService.updateLogFailToSuccess(logTask); + } } } catch (Exception e) { logger.info("payApplyCallBack方法执行出错:{}",e); @@ -286,14 +301,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { * @return */ private Map headersValueOf(String sign, long timestamp) { - logger.info("开始组装请求头参数:{},{}",sign,timestamp); Map header = new HashMap(); header.put(CBSUtil.SIGN_HEADER_NAME, sign); header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp)); header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE); - logger.info("准备获取token"); header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken()); - logger.info("组装后的header参数:{}",JSONObject.toJSONString(header)); return header; } @@ -306,7 +318,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { private void encrypAndsign(SysExtensionApiEntity entity, String requestData) { //签名 long timestamp = System.currentTimeMillis(); - logger.info("CBS请求参数明文:{}", requestData); String sign = CBSUtil.sign(requestData, timestamp); //加密 byte[] encryptedData = CBSUtil.encrypt(requestData); @@ -314,6 +325,5 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { header.put("hzyaExtData", requestData); entity.setByteBodys(encryptedData); entity.setHeaders(header); - logger.info("加密，签名方法执行完毕"); } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 046fefdd..865721ad 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -442,11 +442,11 @@ where id = #{id} - MODIFY COLUMN ${item.enName} decimal(${item.filedLength}) DEFAULT NULL COMMENT + MODIFY COLUMN ${item.enName} decimal(${item.filedLength},8) DEFAULT NULL COMMENT #{item.chName}, - add COLUMN ${item.enName} decimal(${item.filedLength}) DEFAULT NULL COMMENT + add COLUMN ${item.enName} decimal(${item.filedLength},8) DEFAULT NULL COMMENT #{item.chName}, @@ -505,14 +505,14 @@ where id = #{id} - add COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT + add COLUMN ${enName} decimal(${filedLength},8) DEFAULT NULL COMMENT #{chName} drop COLUMN ${enName} - MODIFY COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT + MODIFY COLUMN ${enName} decimal(${filedLength},8) DEFAULT NULL COMMENT #{chName} @@ -566,13 +566,13 @@ where id = #{id} - add ${enName} decimal(${filedLength}) DEFAULT NULL + add ${enName} decimal(${filedLength},8) DEFAULT NULL drop ${enName} - MODIFY ${enName} decimal(${filedLength}) DEFAULT NULL + MODIFY ${enName} decimal(${filedLength},8) DEFAULT NULL diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index 2d59e3b7..cedbf8a3 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -1482,6 +1482,11 @@ public class MdmModuleServiceImpl extends BaseService i } entity.setUpdate(); entity.setDataType("2"); + try { + mdmModuleDao.alterTableField(entity); + } catch (Exception e){ + throw new BaseSystemException("表字段类型，修改失败，请联系管理员"); + } List mdmModuleDbFiledsEntities = new ArrayList<>(); mdmModuleDbFiledsEntities.add(entity); mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities); @@ -1505,11 +1510,11 @@ public class MdmModuleServiceImpl extends BaseService i } } } - try { - mdmModuleDao.alterTableField(entity); - } catch (Exception e){ - throw new BaseSystemException("表字段类型，修改失败，请联系管理员"); - } + //try { + // mdmModuleDao.alterTableField(entity); + //} catch (Exception e){ + // throw new BaseSystemException("表字段类型，修改失败，请联系管理员"); + //} return BaseResult.getSuccessMessageEntity("修改字段成功"); } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml index 540c0e9f..0bb6e1c3 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml @@ -291,7 +291,7 @@ update mdm_module_db_fileds set query_type = #{queryType}, list_type = #{listType}, view_type = #{viewType}, - filed_length = #{filedLength}, + filed_length = #{filedLength}, create_user_id = #{create_user_id}, create_time = #{create_time}, modify_user_id = #{modify_user_id}, diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java index e0031f98..d20f7090 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java @@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @since 2024-06-03 08:47:10 */ public class MdmModuleDbFiledsRuleEntity extends BaseEntity { - + /** 主数据模版ID */ private String mdmId; /** 前端分拣用 */ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/IMdmModuleDistributeTripartiteDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/IMdmModuleDistributeTripartiteDao.java new file mode 100644 index 00000000..21591ebd --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/IMdmModuleDistributeTripartiteDao.java @@ -0,0 +1,16 @@ +package com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao; + +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据下发三方主键表(mdm_module_distribute_tripartite: table)表数据库访问层 + * + * @author makejava + * @since 2024-07-15 11:33:38 + */ +public interface IMdmModuleDistributeTripartiteDao extends IBaseDao { + + MdmModuleDistributeTripartiteEntity queryOneTripartite(MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity); +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/impl/MdmModuleDistributeTripartiteDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/impl/MdmModuleDistributeTripartiteDaoImpl.java new file mode 100644 index 00000000..eb975a55 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/dao/impl/MdmModuleDistributeTripartiteDaoImpl.java @@ -0,0 +1,22 @@ +package com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao.impl; + +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao.IMdmModuleDistributeTripartiteDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据下发三方主键表(MdmModuleDistributeTripartite)表数据库访问层 + * + * @author makejava + * @since 2024-07-15 11:33:38 + */ +@Repository(value = "MdmModuleDistributeTripartiteDaoImpl") +public class MdmModuleDistributeTripartiteDaoImpl extends MybatisGenericDao implements IMdmModuleDistributeTripartiteDao{ + + @Override + public MdmModuleDistributeTripartiteEntity queryOneTripartite(MdmModuleDistributeTripartiteEntity entity) { + MdmModuleDistributeTripartiteEntity o = (MdmModuleDistributeTripartiteEntity) super.selectOne(getSqlIdPrifx() + "queryOneTripartite", entity); + return o; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.java new file mode 100644 index 00000000..b6310ea8 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.java @@ -0,0 +1,66 @@ +package com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据下发三方主键表(MdmModuleDistributeTripartite)实体类 + * + * @author makejava + * @since 2024-07-15 11:33:39 + */ +public class MdmModuleDistributeTripartiteEntity extends BaseEntity { + + /** 公司id */ + private String companyId; + /** 主数据id */ + private String mdmId; + /** 数据id */ + private String dataId; + /** 应用id */ + private String appId; + /** 三方id */ + private String tripartiteId; + + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getTripartiteId() { + return tripartiteId; + } + + public void setTripartiteId(String tripartiteId) { + this.tripartiteId = tripartiteId; + } + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.xml new file mode 100644 index 00000000..82a513a7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/entity/MdmModuleDistributeTripartiteEntity.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + id + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + ,mdm_id + ,data_id + ,app_id + ,tripartite_id + + + + + + + + + + + + + + + + insert into mdm_module_distribute_tripartite( + + id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + mdm_id , + data_id , + app_id , + tripartite_id , + sts, + + )values( + + #{id} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{mdmId} , + #{dataId} , + #{appId} , + #{tripartiteId} , + 'Y', + + ) + + + + insert into mdm_module_distribute_tripartite(create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, mdm_id, data_id, app_id, tripartite_id, sts) + values + + (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.mdmId},#{entity.dataId},#{entity.appId},#{entity.tripartiteId}, 'Y') + + + + + insert into mdm_module_distribute_tripartite(create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, mdm_id, data_id, app_id, tripartite_id) + values + + (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.mdmId},#{entity.dataId},#{entity.appId},#{entity.tripartiteId}) + + on duplicate key update + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id), + mdm_id = values(mdm_id), + data_id = values(data_id), + app_id = values(app_id), + tripartite_id = values(tripartite_id) + + +update mdm_module_distribute_tripartite set + + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + mdm_id = #{mdmId}, + data_id = #{dataId}, + app_id = #{appId}, + tripartite_id = #{tripartiteId}, + +where id = #{id} + + + +update mdm_module_distribute_tripartite set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_module_distribute_tripartite set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and mdm_id = #{mdmId} + and data_id = #{dataId} + and app_id = #{appId} + and tripartite_id = #{tripartiteId} + and sts='Y' + + + + + delete from mdm_module_distribute_tripartite where id = #{id} + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/IMdmModuleDistributeTripartiteService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/IMdmModuleDistributeTripartiteService.java new file mode 100644 index 00000000..962b2cc3 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/IMdmModuleDistributeTripartiteService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.mdm.mdmModuleDistributeTripartite.service; + +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 主数据下发三方主键表(MdmModuleDistributeTripartite)表服务接口 + * + * @author makejava + * @since 2024-07-15 11:33:39 + */ +public interface IMdmModuleDistributeTripartiteService extends IBaseService{ +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/impl/MdmModuleDistributeTripartiteServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/impl/MdmModuleDistributeTripartiteServiceImpl.java new file mode 100644 index 00000000..773679e7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeTripartite/service/impl/MdmModuleDistributeTripartiteServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.mdm.mdmModuleDistributeTripartite.service.impl; + +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao.IMdmModuleDistributeTripartiteDao; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.service.IMdmModuleDistributeTripartiteService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 主数据下发三方主键表(MdmModuleDistributeTripartite)表服务实现类 + * + * @author makejava + * @since 2024-07-15 11:33:39 + */ +@Service(value = "mdmModuleDistributeTripartiteService") +public class MdmModuleDistributeTripartiteServiceImpl extends BaseService implements IMdmModuleDistributeTripartiteService { + + private IMdmModuleDistributeTripartiteDao mdmModuleDistributeTripartiteDao; + + @Autowired + public void setMdmModuleDistributeTripartiteDao(IMdmModuleDistributeTripartiteDao dao) { + this.mdmModuleDistributeTripartiteDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index 98483ea8..033a4458 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -20,6 +20,8 @@ import com.hzya.frame.mdm.mdmModuleDistribute.dao.IMdmModuleDistributeDao; import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; import com.hzya.frame.mdm.mdmModuleDistributeDetail.dao.IMdmModuleDistributeDetailDao; import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.dao.IMdmModuleDistributeTripartiteDao; +import com.hzya.frame.mdm.mdmModuleDistributeTripartite.entity.MdmModuleDistributeTripartiteEntity; import com.hzya.frame.mdm.mdmModuleOptionLog.dao.IMdmModuleOptionLogDao; import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; @@ -86,7 +88,8 @@ public class MdmServiceImpl implements IMdmService { private ISysApplicationScriptDao sysApplicationScriptDao; @Resource private IMdmModuleDao mdmModuleDao; - + @Resource + private IMdmModuleDistributeTripartiteDao mdmModuleDistributeTripartiteDao; @Resource private IIntegrationTaskLivingDetailsService taskLivingDetailsService; @Resource @@ -1811,13 +1814,29 @@ public class MdmServiceImpl implements IMdmService { parameterJson.put("body", apiEntity.getBodyIn()); parameterJson.put("query", apiEntity.getQueryIn()); parameterJson.put("data", object); + + if (!"1".equals(type)) {//删除或者修改情况,查询三方id，有就设置，没有就设置空 + //1、根据主数据id、数据id、应用ID默认查询主数据应用下发三方id表，只查询最新的一条数据 + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setSts("Y"); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDistributeTripartiteEntity.setDataId(object.getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity); + String tripartiteId = ""; + if(mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null ){ + tripartiteId = mdmModuleDistributeTripartiteEntity.getTripartiteId(); + } + parameterJson.put("tripartiteId", tripartiteId); + } + /** head */ Map header = null; /** query */ String querys = null; /** body */ String bodys = object.toJSONString(); - if (scriptEntity != null && scriptEntity.getId() != null) { + if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getScriptData() != null ) { groovy.put("code", scriptEntity.getScriptCode()); groovy.put("className", scriptEntity.getClassName()); groovy.put("name", scriptEntity.getScriptName()); @@ -1885,6 +1904,39 @@ public class MdmServiceImpl implements IMdmService { //组装数据发送 JsonResultEntity jsonResultEntity = sendData(apiEntity, headers, bodys, querys); if (jsonResultEntity.isFlag()) { + + if ("1".equals(type)) {//保存三方返回id + if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null ) { + JSONObject backScriptJson = new JSONObject(); + backScriptJson.put("data", jsonResultEntity.getAttribute()); + groovy.put("code", scriptEntity.getScriptCode()+"back"); + groovy.put("className", scriptEntity.getClassName()+"back"); + groovy.put("name", scriptEntity.getScriptName()+"back"); + groovy.put("methodStr", scriptEntity.getBackScriptData()); + groovy.put("parameterJson", backScriptJson); + JSONObject groovyStr = new JSONObject(); + groovyStr.put("jsonStr", groovy); + try { + Object str = groovyIntegrationService.groovyScriptExecution(groovyStr); + if(str != null){ + JSONObject backJsonResultEntity = JSONObject.parseObject(str.toString()); + if(backJsonResultEntity != null && backJsonResultEntity.getString("success") != null && "true".equals(backJsonResultEntity.getString("success"))){ + MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity(); + mdmModuleDistributeTripartiteEntity.setCreate(); + mdmModuleDistributeTripartiteEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDistributeTripartiteEntity.setDataId(object.getString("id")); + mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); + mdmModuleDistributeTripartiteEntity.setTripartiteId(backJsonResultEntity.getString("tripartiteId")); + mdmModuleDistributeTripartiteDao.save(mdmModuleDistributeTripartiteEntity); + } + } + } catch (Exception e) { + logger.error("新增返回脚本解析保存三方id错误"+jsonResultEntity.getAttribute()); + saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type); + return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getMsg()); + } + } + } saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"1", "发送成功", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type); return BaseResult.getSuccessMessageEntity("发送成功"); } else { @@ -2209,7 +2261,7 @@ public class MdmServiceImpl implements IMdmService { private JsonResultEntity sendData(SysApplicationApiEntity applicationApiEntity, Map headers, String bodys, String querys) { StringBuffer urls = new StringBuffer(url); - if (querys != null) { + if (querys != null && !"".equals(querys)) { urls.append("?"); urls.append(querys); } diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/entity/NingboBankTreasuryEntity.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/entity/NingboBankTreasuryEntity.java new file mode 100644 index 00000000..aa72daf7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/entity/NingboBankTreasuryEntity.java @@ -0,0 +1,9 @@ +package com.hzya.frame.ningboBankTreasury.entity; + +import com.hzya.frame.web.entity.BaseEntity; + + +public class NingboBankTreasuryEntity extends BaseEntity { + +} + diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java new file mode 100644 index 00000000..d4f0b098 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java @@ -0,0 +1,28 @@ +package com.hzya.frame.ningboBankTreasury.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface INingboBankTreasuryService { + + + + /** + * @Author lvleigang + * @Description 单笔查证接口 + * @Date 4:45 下午 2024/7/9 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + Object sendNbBank(JSONObject jsonObject); + + /** + * + * @content 此方法获取初始化参数，拼接请求参数 + * @author laborer + * @date 2024/5/27 0027 11:38 + * + */ + SysExtensionApiEntity doChangeData(SysExtensionApiEntity entity); +} diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java new file mode 100644 index 00000000..488eb869 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java @@ -0,0 +1,148 @@ +package com.hzya.frame.ningboBankTreasury.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.bip.v3.v2207.dps.service.impl.PayMentServiceImpl; +import com.hzya.frame.ningboBankTreasury.service.INingboBankTreasuryService; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.util.bipV3.SHA256Util; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import com.nbcb.sdk.OpenSDK; +import com.nbcb.sdk.aes.exception.SDKException; +import com.nbcb.sdk.aes.param.ConfigParam; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + + +@Service(value = "ningboBankTreasuryServiceImpl") +public class NingboBankTreasuryServiceImpl implements INingboBankTreasuryService { + private static final Logger logger = LoggerFactory.getLogger(NingboBankTreasuryServiceImpl.class); + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 单笔查证接口 + * @Date 4:45 下午 2024/7/9 + **/ + @Override + public Object sendNbBank(JSONObject jsonObject) { + JSONObject returnJson = new JSONObject(); + JSONObject entity = getstrObj("jsonStr", jsonObject); + String dataJson = entity.getString("Data"); + String appKey = entity.getString("appKey"); + String privateKey = entity.getString("privateKey"); + String publicUrl = entity.getString("publicUrl"); + String publicKey = entity.getString("publicKey"); + String productID = entity.getString("productID"); + String serviceID = entity.getString("serviceID"); + //初始化宁波银行OpenSDK + try { + ConfigParam configParam = new ConfigParam(privateKey,publicUrl,appKey,publicKey,10000,20000); + OpenSDK.dynamicInit(configParam,true); + } catch (SDKException e) { + logger.error("初始化宁波银行OpenSDK错误:{}",e.getMessage()); + returnJson.put("retCode","9999"); + returnJson.put("retMsg","初始化宁波银行OpenSDK错误"); + return returnJson; + } + //发送数据 + try { + String returnData = OpenSDK.send(productID,serviceID,dataJson.replace(" ","")); + if(returnData == null || "".equals(returnData)){ + returnJson.put("retCode","9999"); + returnJson.put("retMsg","发送宁波银行OpenSDK返回错误"); + return returnJson; + } + try { + returnJson = JSONObject.parseObject(returnData); + JSONObject retData = returnJson.getJSONObject("Data"); + String retCode = retData.getString("retCode"); + String retMsg = retData.getString("retMsg"); + returnJson.put("retCode",retCode); + returnJson.put("retMsg",retMsg); + return returnJson; + } catch (Exception e) { + returnJson.put("retCode","9999"); + returnJson.put("retMsg","发送宁波银行OpenSDK返回转换Json错误"); + return returnJson; + } + } catch (Exception e) { + returnJson.put("retCode","9999"); + returnJson.put("retMsg","发送宁波银行OpenSDK错误"); + return returnJson; + } + } + + /** + * @param entity + * @content 此方法获取初始化参数，拼接请求参数 + * @author laborer + * @date 2024/5/27 0027 11:38 + */ + @Override + public SysExtensionApiEntity doChangeData(SysExtensionApiEntity entity) { + try { + if(entity == null ){ + return entity; + } + Map returnHeaders = new HashMap<>(); + JSONObject returnDataData = new JSONObject(); + JSONObject returnData = new JSONObject(); + Map headers = entity.getHeaders(); + String bodys = entity.getBodys(); + JSONObject data = JSONObject.parseObject(bodys); + + //先处理转发请求header + returnHeaders.put("yatl",headers.get("yatl")); + returnHeaders.put("yadj",headers.get("yadj")); + + returnDataData.put("appKey",headers.get("appKey")); + returnDataData.put("privateKey",headers.get("privateKey")); + returnDataData.put("publicUrl",headers.get("publicUrl")); + returnDataData.put("publicKey",headers.get("publicKey")); + returnDataData.put("productID",headers.get("productID")); + returnDataData.put("serviceID",headers.get("serviceID")); + data.put("custId",headers.get("custId")); + returnData.put("Data",data); + returnDataData.put("Data",returnData); + entity.setHeaders(returnHeaders); + entity.setBodys(returnDataData.toJSONString()); + } catch (Exception e) { + //发送内部处理方法错误 + logger.error("宁波银行内部转换接口错误：{}",e.getMessage()); + } + return entity; + } + + + + + public JSONObject getstrObj(String key, JSONObject object) { + if (checkStr(object.getString(key)) ) { + return object.getJSONObject(key); + } + return new JSONObject(); + } + /** + * @param str + * @return void + * @Author lvleigang + * @Description 校验字符串 + * @Date 11:41 上午 2022/12/7 + **/ + protected Boolean checkStr(String str) { + Boolean flag = true; + if (str == null || "".equals(str)) { + flag = false; + } + return flag; + } +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java index 032d1a3e..99a7f7d3 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java @@ -9,4 +9,11 @@ import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; * @Date 2024/6/14 17:30 **/ public interface ICbsLogDao extends IBaseDao { + + /** + * 更新日志 + * @param entity + * @return + */ + int updateLog(CbsLogEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java index a42437b0..bdd0ff3c 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.seeyon.cbs8.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao; import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; @@ -12,4 +13,16 @@ import org.springframework.stereotype.Repository; **/ @Repository() public class CbsLogDaoImpl extends MybatisGenericDao implements ICbsLogDao { + /** + * 更新日志 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public int updateLog(CbsLogEntity entity) { + this.update(getSqlIdPrifx()+"entity_update",entity); + return 0; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java index 4776058c..d3637a10 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java @@ -25,7 +25,10 @@ public class AgentPaymentDetailEntity extends BaseEntity { //明细序号，从1开始递增 private int dtlSeqNum; - + //明细用途 + private String dtlPurpose; + //是否跨行 Y表示跨行 N表示同行 + private String dtlBankFlag; //支付结果 private String payResult; //支付日期 @@ -110,4 +113,20 @@ public class AgentPaymentDetailEntity extends BaseEntity { public void setPayDate(String payDate) { this.payDate = payDate; } + + public String getDtlPurpose() { + return dtlPurpose; + } + + public void setDtlPurpose(String dtlPurpose) { + this.dtlPurpose = dtlPurpose; + } + + public String getDtlBankFlag() { + return dtlBankFlag; + } + + public void setDtlBankFlag(String dtlBankFlag) { + this.dtlBankFlag = dtlBankFlag; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml index 43869fc1..3b9526f6 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml @@ -11,6 +11,8 @@ + + @@ -25,6 +27,8 @@ dtlCnapsCode, dtlRevName, dtlRevBankName, + dtlPurpose, + dtlBankFlag, payResult, payDate @@ -39,16 +43,19 @@ formson_0225.id, formson_0225.formmain_id AS formmainId, 'formson_0225' AS tabName, + 'N' AS dtlBankFlag, formson_0225.field0001 AS dtlSeqNum, formson_0225.field0019 AS dtlAmount, formson_0225.field0036 AS dtlRevAccount, formson_0225.field0035 AS dtlCnapsCode, formson_0225.field0037 AS dtlRevName, formson_0225.field0034 AS dtlRevBankName, + to_char(formmain_0224.field0030,'yyyy-MM')||'月'||'工资'AS dtlPurpose, formson_0225.field0044 AS payResult, formson_0225.field0045 AS payDate FROM formson_0225 + LEFT JOIN formmain_0224 ON formmain_0224.id = formson_0225.formmain_id )formson_0225 formson_0225.id = #{id} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java index 65b9ea9a..be06fc7b 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java @@ -40,6 +40,8 @@ public class AgentPaymentEntity extends BaseEntity { private String tableName;//表名称 private String billName;//单据名称 + private String payBankType;//付款银行类型 + public String getReferenceNum() { return referenceNum; } @@ -151,4 +153,12 @@ public class AgentPaymentEntity extends BaseEntity { public void setPayDate(String payDate) { this.payDate = payDate; } + + public String getPayBankType() { + return payBankType; + } + + public void setPayBankType(String payBankType) { + this.payBankType = payBankType; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml index e83daca0..a74d8911 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml @@ -27,6 +27,7 @@ busType, amount, currency, + payBankType, payAccount, applyCode, payResult, @@ -52,7 +53,8 @@ '755915707610112' AS payAccount, formmain_0224.field0043 AS applyCode, formmain_0224.field0046 AS payResult, - '工资' AS purpose + formmain_0224.field0053 as payBankType, + to_char(formmain_0224.field0030,'yyyy-MM')||'月'||''工资' AS purpose FROM formmain_0224 LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml index 3e03a88a..5ce3318f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml @@ -106,6 +106,7 @@ field0010 =#{pay_state}, field0011 =#{message}, field0012 =#{apply_state}, + field0005 =#{cbs_apply_code}, field0014 =#{successed} where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java index 9f68e3ff..e2e46f98 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java @@ -45,6 +45,10 @@ public class PaymentEntity extends BaseEntity { private String payType;//付款类别 private String payCompanyCode;//付款公司编码 + //是否重试 + private String retryFlag; + //重试日志id + private String taskDetailId; public String getOaId() { return oaId; } @@ -324,4 +328,20 @@ public class PaymentEntity extends BaseEntity { public void setApplyCode(String applyCode) { this.applyCode = applyCode; } + + public String getRetryFlag() { + return retryFlag; + } + + public void setRetryFlag(String retryFlag) { + this.retryFlag = retryFlag; + } + + public String getTaskDetailId() { + return taskDetailId; + } + + public void setTaskDetailId(String taskDetailId) { + this.taskDetailId = taskDetailId; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml index 410dca31..cf029e1d 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml @@ -315,74 +315,37 @@ @@ -424,10 +389,9 @@ diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java index 4446877b..fc70519e 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java @@ -109,12 +109,13 @@ public class CbsLogServiceImpl extends BaseService implemen logEntity.setApply_state(apply_state); logEntity.setSuccessed(successed); logEntity.setBill_code(cbsLogEntity.getBill_code()); + logEntity.setCbs_apply_code(cbs_apply_code); logEntity.setDataSourceCode(oa_data_source_code); try { updateLog(logEntity); }catch (Exception e){ e.printStackTrace(); - logger.error("更新"); + logger.error("更新cbs交易日志出错:{}",e); } } } @@ -186,10 +187,10 @@ public class CbsLogServiceImpl extends BaseService implemen * * @param logEntity */ - @DS("#logEntity.dataSourceCode") + // @DS("#logEntity.dataSourceCode") @Override public void updateLog(CbsLogEntity logEntity) { - cbsLogDao.update(logEntity); + cbsLogDao.updateLog(logEntity); } //获取xml模板 diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.java index 2502fd7e..142a078a 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.java @@ -22,6 +22,8 @@ public class SysApplicationScriptEntity extends BaseEntity { private String className; /** 脚本内容 */ private String scriptData; + /** 返回脚本内容 */ + private String backScriptData; /** 描述 */ private String scriptRemark; /** 发布日期 */ @@ -112,5 +114,12 @@ public class SysApplicationScriptEntity extends BaseEntity { this.companyId = companyId; } + public String getBackScriptData() { + return backScriptData; + } + + public void setBackScriptData(String backScriptData) { + this.backScriptData = backScriptData; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.xml index 2ce87f67..f0842ca2 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.xml @@ -10,6 +10,7 @@ + @@ -31,7 +32,8 @@ ,script_version ,class_name ,script_data - ,script_remark + ,back_script_data + ,script_remark ,release_date ,script_status ,sorts @@ -62,6 +64,7 @@ and script_version = #{scriptVersion} and class_name = #{className} and script_data = #{scriptData} + and back_script_data = #{backScriptData} and script_remark = #{scriptRemark} and release_date = #{releaseDate} and script_status = #{scriptStatus} @@ -90,6 +93,7 @@ and script_version = #{scriptVersion} and class_name = #{className} and script_data = #{scriptData} + and back_script_data = #{backScriptData} and script_remark = #{scriptRemark} and release_date = #{releaseDate} and script_status = #{scriptStatus} @@ -120,6 +124,7 @@ and script_version like concat('%',#{scriptVersion},'%') and class_name like concat('%',#{className},'%') and script_data like concat('%',#{scriptData},'%') + and back_script_data like concat('%',#{backScriptData},'%') and script_remark like concat('%',#{scriptRemark},'%') and release_date like concat('%',#{releaseDate},'%') and script_status like concat('%',#{scriptStatus},'%') @@ -150,6 +155,7 @@ or script_version = #{scriptVersion} or class_name = #{className} or script_data = #{scriptData} + or back_script_data = #{backScriptData} or script_remark = #{scriptRemark} or release_date = #{releaseDate} or script_status = #{scriptStatus} @@ -178,6 +184,7 @@ script_version , class_name , script_data , + back_script_data , script_remark , release_date , script_status , @@ -200,6 +207,7 @@ #{scriptVersion} , CONCAT('g','_',LAST_INSERT_ID()) , #{scriptData} , + #{backScriptData} , #{scriptRemark} , #{releaseDate} , #{scriptStatus} , @@ -217,18 +225,18 @@ - insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data,back_script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.backScriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data,back_script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.backScriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update app_id = values(app_id), @@ -237,6 +245,7 @@ script_version = values(script_version), class_name = values(class_name), script_data = values(script_data), + back_script_data = values(back_script_data), script_remark = values(script_remark), release_date = values(release_date), script_status = values(script_status), @@ -257,6 +266,7 @@ update sys_application_script set script_version = #{scriptVersion}, class_name = #{className}, script_data = #{scriptData}, + back_script_data = #{backScriptData}, script_remark = #{scriptRemark}, release_date = #{releaseDate}, script_status = #{scriptStatus}, @@ -286,6 +296,7 @@ update sys_application_script set sts= 'N' ,modify_time = #{modify_time},modify and script_version = #{scriptVersion} and class_name = #{className} and script_data = #{scriptData} + and back_script_data = #{backScriptData} and script_remark = #{scriptRemark} and release_date = #{releaseDate} and script_status = #{scriptStatus} diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 519e4415..8058f056 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -587,6 +587,7 @@ public class SysApplicationServiceImpl extends BaseService def3 , def4 , def5 , - sorts, sts, )values( @@ -326,7 +325,6 @@ #{def3} , #{def4} , #{def5} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ), 'Y', ) @@ -368,7 +366,6 @@ def3 , def4 , def5 , - sorts, sts, )values( @@ -405,7 +402,6 @@ #{def3} , #{def4} , #{def5} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ), 'Y', ) diff --git a/service/src/main/java/com/hzya/frame/sysnew/person/entity/SysPersonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/person/entity/SysPersonEntity.xml index 7ff0a07d..ea0abb65 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/person/entity/SysPersonEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/person/entity/SysPersonEntity.xml @@ -228,7 +228,7 @@ a.id from sys_person a and a.id like concat('%',#{id},'%') - and a.organ_id like concat('%',#{organId},'%') + and a.organ_id = #{organId} and a.person_code like concat('%',#{personCode},'%') and a.person_name like concat('%',#{personName},'%') and a.sex like concat('%',#{sex},'%') diff --git a/service/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar b/service/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar rename to service/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar diff --git a/service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.57.jar b/service/src/main/resources/lib/bcprov-jdk15on-1.57.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.57.jar rename to service/src/main/resources/lib/bcprov-jdk15on-1.57.jar diff --git a/service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar b/service/src/main/resources/lib/bcprov-jdk15on-1.70.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar rename to service/src/main/resources/lib/bcprov-jdk15on-1.70.jar diff --git a/service/src/main/resources/lib/openBasicSDK-2.1.230630.jar b/service/src/main/resources/lib/openBasicSDK-2.1.230630.jar new file mode 100644 index 00000000..e7e5ce1b Binary files /dev/null and b/service/src/main/resources/lib/openBasicSDK-2.1.230630.jar differ diff --git a/service/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar b/service/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar rename to service/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar diff --git a/service/src/main/webapp/WEB-INF/lib/yonyoulog.jar b/service/src/main/resources/lib/yonyoulog.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/yonyoulog.jar rename to service/src/main/resources/lib/yonyoulog.jar diff --git a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java b/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java index a24e46a8..566736e8 100644 --- a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java +++ b/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java @@ -10,6 +10,7 @@ import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingE import com.hzya.frame.web.quartz.QuartzJobFactoryUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.annotation.Order; @@ -34,13 +35,17 @@ public class MyApplicationListener implements ApplicationListener