Skip to content

I
isc-core
Commit 564aaab2 by hulei
Options

Merge branch 'develop-hlj' into 'develop' 

多实体公共处理合并

See merge request isc-v3.1/isc-core!1
parents a1b61a54 868158c7
Showing with 600 additions and 229 deletions
isc-common-core/src/main/java/com/brilliance/isc/bo/Xrt.java
......@@ -4,6 +4,8 @@ import com.brilliance.mda.runtime.mda.util.Decimals;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
......@@ -15,7 +17,8 @@ import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
/**
* TABLE:xrt:XRT - Exchange Rate
*/
@Data
@Getter
@Setter
@JsonIgnoreProperties(ignoreUnknown = true)
public class Xrt {
......@@ -66,9 +69,14 @@ public class Xrt {
//Buying Rate 1
private BigDecimal buy1rat = Decimals.ZERO_SCALE6;
//Buying Rate 1
private BigDecimal sel2rat = Decimals.ZERO_SCALE6;
//Entity Group of Exchange Rate
private String etgextkey = NULLSTR;
//Time of XRT
private String xrttim = NULLSTR;
}
\ No newline at end of file
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/EtyMapper.java
......@@ -30,4 +30,6 @@ public interface EtyMapper {
Ety getEtyByExtkey(String extkey);
List<Ety> selectAll();
}
\ No newline at end of file
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/FecMapper.java
......@@ -41,6 +41,8 @@ public interface FecMapper {
List<Fec> selectFecByObjtypAndObjinrAndFeeinrAndFeepri(@Param("objtyp") String objtyp, @Param("objinr") String objinr, @Param("feeinr") String feeinr, @Param("feepri") String feepri);
List<Fec> selectFecByConditionSql(@Param(value = "conditionSql") String conditionSql);
List<Fec> selectFecByConditionSqlAndParams(Map<String,Object> sqlAndParams);
FecVo queryById(@Param("inr")String inr);
FecVo queryById1(@Param("inr")String inr);
......
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/PtyMapper.java
package com.brilliance.isc.mda.dao;
import com.brilliance.isc.bo.Bch;
import com.brilliance.isc.bo.Pty;
import com.brilliance.isc.vo.manager.PtyManageVo;
import com.brilliance.isc.vo.manager.PtyTVo;
......@@ -333,5 +332,7 @@ public interface PtyMapper {
int updatePtySigflg(@Param("sigflg") String sigflg, @Param("inr") String inr);
List<Pty> selectInfoByExtkeyOrNamOrNam1(@Param("extkey") String extkey,@Param("nam1") String nam1,@Param("nam") String nam);
List<Pty> selectInfoByExtkeyOrNamOrNam1(@Param("extkey") String extkey,@Param("nam1") String nam1,@Param("nam") String nam);
Pty queryOwnPty(@Param("extkey") String extkey,@Param("etgextkey") String etgextkey);
}
\ No newline at end of file
isc-common-core/src/main/java/com/brilliance/mda/support/mybatis/interceptor/CustomParameterInterceptor.java 0 → 100644
package com.brilliance.mda.support.mybatis.interceptor;
import com.github.pagehelper.util.ExecutorUtil;
import com.github.pagehelper.util.MetaObjectUtil;
import org.apache.ibatis.builder.annotation.ProviderSqlSource;
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.plugin.Intercepts;
import org.apache.ibatis.plugin.Invocation;
import org.apache.ibatis.plugin.Signature;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
/**
* 拦截查询语句，自动获取ETY，ETG信息加入SQL参数列表，
* SQL语句中可直接通过固定名称获取。
* _etyextkey etyextkey绑定属性名
* _etgextkey etgextkey绑定属性名
* @Auth hulei
* @DATE 2024/11/01
*/
@Intercepts({
@Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
@Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}),
})
public class CustomParameterInterceptor implements Interceptor {
private static final Logger logger = LoggerFactory.getLogger(CustomParameterInterceptor.class);
private ParameterProcessor parameterProcessor;
public CustomParameterInterceptor(ParameterProcessor parameterProcessor){
this.parameterProcessor = parameterProcessor;
}
@Override
public Object intercept(Invocation invocation) throws Throwable {
if(!parameterProcessor.checkParameter()){
return invocation.proceed();
}
Object[] args = invocation.getArgs();
MappedStatement ms = (MappedStatement) args[0];
Object parameter = args[1];
RowBounds rowBounds = (RowBounds) args[2];
ResultHandler resultHandler = (ResultHandler) args[3];
Executor executor = (Executor) invocation.getTarget();
CacheKey cacheKey;
BoundSql boundSql;
if (args.length == 4) {
//4 个参数时
boundSql = ms.getBoundSql(parameter);
cacheKey = executor.createCacheKey(ms, parameter, rowBounds, boundSql);
} else {
//6 个参数时
cacheKey = (CacheKey) args[4];
boundSql = (BoundSql) args[5];
}
args[1] = processParameterObject(ms,parameter,boundSql,cacheKey);
return invocation.proceed();
}
public Object processParameterObject(MappedStatement ms, Object parameterObject, BoundSql boundSql, CacheKey pageKey) {
//处理参数
Map<String, Object> paramMap = null;
if (parameterObject == null) {
paramMap = new HashMap<>();
} else if (parameterObject instanceof Map) {
//解决不可变Map的情况
paramMap = new HashMap<>();
paramMap.putAll((Map) parameterObject);
} else {
paramMap = new HashMap<>();
// sqlSource为ProviderSqlSource时，处理只有1个参数的情况
if (ms.getSqlSource() instanceof ProviderSqlSource) {
String[] providerMethodArgumentNames = ExecutorUtil.getProviderMethodArgumentNames((ProviderSqlSource) ms.getSqlSource());
if (providerMethodArgumentNames != null && providerMethodArgumentNames.length == 1) {
paramMap.put(providerMethodArgumentNames[0], parameterObject);
paramMap.put("param1", parameterObject);
}
}
//动态sql时的判断条件不会出现在ParameterMapping中，但是必须有，所以这里需要收集所有的getter属性
//TypeHandlerRegistry可以直接处理的会作为一个直接使用的对象进行处理
boolean hasTypeHandler = ms.getConfiguration().getTypeHandlerRegistry().hasTypeHandler(parameterObject.getClass());
MetaObject metaObject = MetaObjectUtil.forObject(parameterObject);
//需要针对注解形式的MyProviderSqlSource保存原值
if (!hasTypeHandler) {
for (String name : metaObject.getGetterNames()) {
paramMap.put(name, metaObject.getValue(name));
}
}
//下面这段方法，主要解决一个常见类型的参数时的问题
if (boundSql.getParameterMappings() != null && boundSql.getParameterMappings().size() > 0) {
for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) {
String name = parameterMapping.getProperty();
if (paramMap.get(name) == null) {
if (hasTypeHandler
|| parameterMapping.getJavaType().equals(parameterObject.getClass())) {
paramMap.put(name, parameterObject);
break;
}
}
}
}
}
return parameterProcessor.processCustomizedParameter(ms, paramMap, boundSql, pageKey);
}
}
isc-common-core/src/main/java/com/brilliance/mda/support/mybatis/interceptor/ParameterProcessor.java 0 → 100644
package com.brilliance.mda.support.mybatis.interceptor;
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import java.util.Map;
public interface ParameterProcessor {
/**
* 已拦截到Mybatis的ParamMpa并转化为Map类型，如需要添加额外的参数，可
* @param ms
* @param paramMap
* @param boundSql
* @param pageKey
* @return
*/
Object processCustomizedParameter(MappedStatement ms, Map<String, Object> paramMap, BoundSql boundSql, CacheKey pageKey) ;
/**
* 提前检查是否需要拦截并对SQL 参数进行处理。
* @return
*/
default boolean checkParameter(){
return true;
}
}
isc-common-core/src/main/resources/mapper/etymapper.xml
......@@ -194,6 +194,12 @@
where trim(extkey) = trim(#{extkey,jdbcType=VARCHAR})
</select>
<select id="selectAll" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM ety WHERE ety.ETG in (select etg.extkey from etg)
</select>
</mapper>
isc-common-core/src/main/resources/mapper/fecmapper.xml
......@@ -641,6 +641,13 @@
${conditionSql}
</select>
<select id="selectFecByConditionSqlAndParams" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from fec
${conditionSql}
</select>
<select id="queryById" resultType="com.brilliance.isc.vo.manager.FecVo">
select B.INR inr, B.FEEINR feeinr, B.FEEPRI feepri, B.OBJTYP objtyp, B.OBJINR objinr, date_format(B.BEGDAT,'%Y-%m-%d') begdat, date_format(B.ENDDAT,'%Y-%m-%d')
enddat, B.CALCBS calcbs, B.CALFCC calfcc, B.LOWAMT lowamt, B.HIGAMT higamt, B.MAXCUR maxcur, B.MAXAMT maxamt,
......
isc-common-core/src/main/resources/mapper/feemapper.xml
......@@ -43,6 +43,7 @@
<include refid="Base_Column_List"/>
from fee
where cod = #{cod,jdbcType=VARCHAR}
and etgextkey = #{_etgextkey}
</select>
<delete id="deleteByPrimaryKey">
......
isc-common-core/src/main/resources/mapper/ptymapper.xml
......@@ -1158,6 +1158,17 @@
and nam like concat('%',#{nam},'%')
</if>
</select>
<select id="queryOwnPty" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from pty
where extkey = #{extkey}
and etgextkey = #{etgextkey}
and ptytyp = 'BA'
</select>
</mapper>
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerBdServer.java
......@@ -18,7 +18,7 @@ public interface InnerBdServer {
* @param req
* @return
*/
@PostMapping("/bh/logout")
@PostMapping("/jk/bh/logout")
InnerRes<InnerResBdBh> callChayan(InnerReq<InnerReqBdBhLogout> req);
/**
* 北京电力保函通知接口
......@@ -26,7 +26,7 @@ public interface InnerBdServer {
* @param req
* @return
*/
@PostMapping("/bh/notice")
@PostMapping("/jk/bh/notice")
InnerRes<InnerResBdBh> callNotice(InnerReq<InnerReqBdBhNotice> req);
......@@ -36,7 +36,7 @@ public interface InnerBdServer {
* @param req
* @return
*/
@PostMapping("/bh/dynotice")
@PostMapping("/jk/bh/dynotice")
InnerRes<InnerResBdBh> dyNotice(InnerReq<InnerReqBdDyNotice> req);
/**
......@@ -45,7 +45,7 @@ public interface InnerBdServer {
* @param req
* @return
*/
@PostMapping("/bh/zcnotice")
@PostMapping("/jk/bh/zcnotice")
InnerRes<InnerResBdBh> zcNotice(InnerReq<InnerReqBdZcNotice> req);
/**
......@@ -54,7 +54,7 @@ public interface InnerBdServer {
* @param req
* @return
*/
@PostMapping("/bh/txnotice")
@PostMapping("/jk/bh/txnotice")
InnerRes<InnerResBdBh> txNotice(InnerReq<InnerReqBdTxNotice> req);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerCcrmServer.java
......@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
//@RequestMapping("/jk")
public interface InnerCcrmServer {
@PostMapping("/OC46")
@PostMapping("/jk/OC46")
InnerRes<InnerResOC46> callOC46(InnerReq<InnerReqOC46> innerReqOC46);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerCecmServer.java
......@@ -21,6 +21,6 @@ public interface InnerCecmServer {
* @param innerReqCM51
* @return
*/
@PostMapping("/CM51")
@PostMapping("/jk/CM51")
InnerRes<InnerResCM51> callCM51(InnerReq<InnerReqCM51> innerReqCM51);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerCfcaServer.java
......@@ -19,7 +19,7 @@ public interface InnerCfcaServer {
* @param innerReqDownload
* @return
*/
@PostMapping("/DOWNLOAD")
@PostMapping("/jk/DOWNLOAD")
InnerRes<InnerResFT72> callDOWNLOAD(InnerReq<InnerReqDownload> innerReqDownload);
/**
......@@ -28,7 +28,7 @@ public interface InnerCfcaServer {
* @param innerReqOfdsignht
* @return
*/
@PostMapping("/Ofdsignht")
@PostMapping("/jk/Ofdsignht")
InnerRes<InnerResGJ70> callOfdsignht(InnerReq<InnerReqOfdsignht> innerReqOfdsignht);
/**
......@@ -37,7 +37,7 @@ public interface InnerCfcaServer {
* @param innerReqAxqCommonsign
* @return
*/
@PostMapping("/Commonsign")
@PostMapping("/jk/Commonsign")
InnerRes<InnerResFT70> callCommonsign(InnerReq<InnerReqAxqCommonsign> innerReqAxqCommonsign);
/**
......@@ -46,7 +46,7 @@ public interface InnerCfcaServer {
* @param innerReqOfdCreate
* @return
*/
@PostMapping("/ofdCreate")
@PostMapping("/jk/ofdCreate")
InnerRes<InnerResOfdCreate> callOfdCreate(InnerReq<InnerReqOfdCreate> innerReqOfdCreate);
/**
......@@ -55,7 +55,7 @@ public interface InnerCfcaServer {
* @param innerReqOfdCreateNt
* @return
*/
@PostMapping("/ofdCreateNt")
@PostMapping("/jk/ofdCreateNt")
InnerRes<InnerResOfdCreateNt> callOfdCreateNt(InnerReq<InnerReqOfdCreateNt> innerReqOfdCreateNt);
/**
......@@ -64,7 +64,7 @@ public interface InnerCfcaServer {
* @param innerReqOfdCreateUsual
* @return
*/
@PostMapping("/ofdCreateUsual")
@PostMapping("/jk/ofdCreateUsual")
InnerRes<InnerResOfdCreateUsual> callOfdCreateUsual(InnerReq<InnerReqOfdCreateUsual> innerReqOfdCreateUsual);
/**
......@@ -73,7 +73,7 @@ public interface InnerCfcaServer {
* @param innerReqAxqQianshu
* @return
*/
@PostMapping("/axqQianshu")
@PostMapping("/jk/axqQianshu")
InnerRes<InnerResAxqQianshu> callAxqQianshu(InnerReq<InnerReqAxqQianshu> innerReqAxqQianshu);
/**
......@@ -82,7 +82,7 @@ public interface InnerCfcaServer {
* @param innerReqAxqQianshu1
* @return
*/
@PostMapping("/axqQianshu1")
@PostMapping("/jk/axqQianshu1")
InnerRes<InnerResAxqQianshu1> callAxqQianshu1(InnerReq<InnerReqAxqQianshu1> innerReqAxqQianshu1);
/**
......@@ -91,7 +91,7 @@ public interface InnerCfcaServer {
* @param innerReqAxqQianshu2
* @return
*/
@PostMapping("/axqQianshu2")
@PostMapping("/jk/axqQianshu2")
InnerRes<InnerResAxqQianshu2> callAxqQianshu2(InnerReq<InnerReqAxqQianshu2> innerReqAxqQianshu2);
/**
......@@ -100,7 +100,7 @@ public interface InnerCfcaServer {
* @param innerReqAxqCreatpdf
* @return
*/
@PostMapping("/axqCreatpdf")
@PostMapping("/jk/axqCreatpdf")
InnerRes<InnerResAxqCreatpdf> callAxqCreatpdf(InnerReq<InnerReqAxqCreatpdf> innerReqAxqCreatpdf);
/**
......@@ -108,6 +108,6 @@ public interface InnerCfcaServer {
* @param innerReqAxqCallFT70
* @return
*/
@PostMapping("/callFT70")
@PostMapping("/jk/callFT70")
InnerRes<InnerResFT70> callFT70(InnerReq<InnerReqAxqCallFT70> innerReqAxqCallFT70);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerClmServer.java
......@@ -18,7 +18,7 @@ public interface InnerClmServer {
* @param innerReqCL86
* @return
*/
@PostMapping("/CL86")
@PostMapping("/jk/CL86")
InnerRes<InnerResCL86> callCL86(InnerReq<InnerReqCL86> innerReqCL86);
/**
......@@ -27,7 +27,7 @@ public interface InnerClmServer {
* @param innerReqCL40
* @return
*/
@PostMapping("/CL40")
@PostMapping("/jk/CL40")
InnerRes<InnerResCL40> callCL40(InnerReq<InnerReqCL40> innerReqCL40);
/**
......@@ -36,7 +36,7 @@ public interface InnerClmServer {
* @param innerReqCL41
* @return
*/
@PostMapping("/CL41")
@PostMapping("/jk/CL41")
InnerRes<InnerResCL41> callCL41(InnerReq<InnerReqCL41> innerReqCL41);
/**
......@@ -45,7 +45,7 @@ public interface InnerClmServer {
* @param innerReqCL42
* @return
*/
@PostMapping("/CL42")
@PostMapping("/jk/CL42")
InnerRes<InnerResCL42> callCL42(InnerReq<InnerReqCL42> innerReqCL42);
/**
......@@ -54,7 +54,7 @@ public interface InnerClmServer {
* @param innerReqCL43
* @return
*/
@PostMapping("/CL43")
@PostMapping("/jk/CL43")
InnerRes<InnerResCL43> callCL43(InnerReq<InnerReqCL43> innerReqCL43);
/**
......@@ -63,7 +63,7 @@ public interface InnerClmServer {
* @param innerReqCL44
* @return
*/
@PostMapping("/CL44")
@PostMapping("/jk/CL44")
InnerRes<InnerResCL44> callCL44(InnerReq<InnerReqCL44> innerReqCL44);
/**
......@@ -72,7 +72,7 @@ public interface InnerClmServer {
* @param innerReqCL45
* @return
*/
@PostMapping("/CL45")
@PostMapping("/jk/CL45")
InnerRes<InnerResCL45> callCL45(InnerReq<InnerReqCL45> innerReqCL45);
/**
......@@ -81,7 +81,7 @@ public interface InnerClmServer {
* @param innerReqCL81
* @return
*/
@PostMapping("/CL81")
@PostMapping("/jk/CL81")
InnerRes<InnerResCL81> callCL81(InnerReq<InnerReqCL81> innerReqCL81);
/**
......@@ -90,7 +90,7 @@ public interface InnerClmServer {
* @param innerReqCL82
* @return
*/
@PostMapping("/CL82")
@PostMapping("/jk/CL82")
InnerRes<InnerResCL82> callCL82(InnerReq<InnerReqCL82> innerReqCL82);
/**
......@@ -99,7 +99,7 @@ public interface InnerClmServer {
* @param innerReqCL83
* @return
*/
@PostMapping("/CL83")
@PostMapping("/jk/CL83")
InnerRes<InnerResCL83> callCL83(InnerReq<InnerReqCL83> innerReqCL83);
/**
......@@ -108,7 +108,7 @@ public interface InnerClmServer {
* @param innerReqCL85
* @return
*/
@PostMapping("/CL85")
@PostMapping("/jk/CL85")
InnerRes<InnerResCL85> callCL85(InnerReq<InnerReqCL85> innerReqCL85);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerComsServer.java
......@@ -18,6 +18,6 @@ public interface InnerComsServer {
/**
* CS06 抵质押物详细信息查询交易
*/
@PostMapping("/CS06")
@PostMapping("/jk/CS06")
InnerRes<InnerResCS06> callCS06(InnerReq<InnerReqCS06> innerReqCS06);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerCpmServer.java
......@@ -21,6 +21,6 @@ public interface InnerCpmServer {
* @param innerReqCPC3
* @return
*/
@PostMapping("/CPC3")
@PostMapping("/jk/CPC3")
InnerRes<InnerResCPC3> callCPC3(InnerReq<InnerReqCPC3> innerReqCPC3);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerEbmpServer.java
......@@ -18,7 +18,7 @@ public interface InnerEbmpServer {
* @param innerReq6603
* @return
*/
@PostMapping("/6603")
@PostMapping("/jk/6603")
InnerRes<InnerRes6603> call6603(InnerReq<InnerReq6603> innerReq6603);
......@@ -28,7 +28,7 @@ public interface InnerEbmpServer {
* @param innerReq6605
* @return
*/
@PostMapping("/6605")
@PostMapping("/jk/6605")
InnerRes<InnerRes6605> call6605(InnerReq<InnerReq6605> innerReq6605);
/**
......@@ -37,7 +37,7 @@ public interface InnerEbmpServer {
* @param innerReqSF03
* @return
*/
@PostMapping("/SF03")
@PostMapping("/jk/SF03")
InnerRes<InnerResSF03> callSF03(InnerReq<InnerReqSF03> innerReqSF03);
/**
......@@ -46,7 +46,7 @@ public interface InnerEbmpServer {
* @param innerReqZM01
* @return
*/
@PostMapping("/ZM01")
@PostMapping("/jk/ZM01")
InnerRes<InnerResZM01> callZM01(InnerReq<InnerReqZM01> innerReqZM01);
/**
......@@ -55,7 +55,7 @@ public interface InnerEbmpServer {
* @param innerReqTM01
* @return
*/
@PostMapping("/TM01")
@PostMapping("/jk/TM01")
InnerRes<InnerResTM01> callTM01(InnerReq<InnerReqTM01> innerReqTM01);
/**
......@@ -64,7 +64,7 @@ public interface InnerEbmpServer {
* @param innerReq6702
* @return
*/
@PostMapping("/6702")
@PostMapping("/jk/6702")
InnerRes<InnerRes6702> call6702(InnerReq<InnerReq6702> innerReq6702);
/**
......@@ -73,7 +73,7 @@ public interface InnerEbmpServer {
* @param innerReq6703
* @return
*/
@PostMapping("/6703")
@PostMapping("/jk/6703")
InnerRes<InnerRes6703> call6703(InnerReq<InnerReq6703> innerReq6703);
/**
......@@ -82,7 +82,7 @@ public interface InnerEbmpServer {
* @param innerReq6704
* @return
*/
@PostMapping("/6704")
@PostMapping("/jk/6704")
InnerRes<InnerRes6704> call6704(InnerReq<InnerReq6704> innerReq6704);
/**
......@@ -91,7 +91,7 @@ public interface InnerEbmpServer {
* @param innerReq6706
* @return
*/
@PostMapping("/6706")
@PostMapping("/jk/6706")
InnerRes<InnerRes6706> call6706(InnerReq<InnerReq6706> innerReq6706);
/**
......@@ -100,7 +100,7 @@ public interface InnerEbmpServer {
* @param innerReq6802
* @return
*/
@PostMapping("/6802")
@PostMapping("/jk/6802")
InnerRes<InnerRes6802> call6802(InnerReq<InnerReq6802> innerReq6802);
/**
......@@ -109,7 +109,7 @@ public interface InnerEbmpServer {
* @param innerReq6803
* @return
*/
@PostMapping("/6803")
@PostMapping("/jk/6803")
InnerRes<InnerRes6803> call6803(InnerReq<InnerReq6803> innerReq6803);
/**
......@@ -118,7 +118,7 @@ public interface InnerEbmpServer {
* @param innerReq6804
* @return
*/
@PostMapping("/6804")
@PostMapping("/jk/6804")
InnerRes<InnerRes6804> call6804(InnerReq<InnerReq6804> innerReq6804);
/**
......@@ -127,7 +127,7 @@ public interface InnerEbmpServer {
* @param innerReq6806
* @return
*/
@PostMapping("/6806")
@PostMapping("/jk/6806")
InnerRes<InnerRes6806> call6806(InnerReq<InnerReq6806> innerReq6806);
/**
......@@ -136,7 +136,7 @@ public interface InnerEbmpServer {
* @param innerReq6902
* @return
*/
@PostMapping("/6902")
@PostMapping("/jk/6902")
InnerRes<InnerRes6902> call6902(InnerReq<InnerReq6902> innerReq6902);
/**
......@@ -145,6 +145,6 @@ public interface InnerEbmpServer {
* @param innerReq6903
* @return
*/
@PostMapping("/6903")
@PostMapping("/jk/6903")
InnerRes<InnerRes6903> call6903(InnerReq<InnerReq6903> innerReq6903);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerEcifServer.java
......@@ -19,7 +19,7 @@ public interface InnerEcifServer {
* @param innerReq0904
* @return
*/
@PostMapping("/0904")
@PostMapping("/jk/0904")
InnerRes<InnerRes0904> call0904(InnerReq<InnerReq0904> innerReq0904);
/**
......@@ -28,7 +28,7 @@ public interface InnerEcifServer {
* @param innerReq0905
* @return
*/
@PostMapping("/0905")
@PostMapping("/jk/0905")
InnerRes<InnerRes0905> call0905(InnerReq<InnerReq0905> innerReq0905);
/**
......@@ -37,7 +37,7 @@ public interface InnerEcifServer {
* @param innerReq0930
* @return
*/
@PostMapping("/0930")
@PostMapping("/jk/0930")
InnerRes<InnerRes0930> call0930(InnerReq<InnerReq0930> innerReq0930);
/**
......@@ -46,6 +46,6 @@ public interface InnerEcifServer {
* @param innerReq0958
* @return
*/
@PostMapping("/0958")
@PostMapping("/jk/0958")
InnerRes<InnerRes0958> call0958(InnerReq<InnerReq0958> innerReq0958);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerEjsServer.java
......@@ -18,7 +18,7 @@ public interface InnerEjsServer {
* @param innerReqEtradefbk
* @return
*/
@PostMapping("/etradefbk")
@PostMapping("/jk/etradefbk")
public InnerRes<InnerResEtradefbk> callFbk(InnerReq<InnerReqEtradefbk> innerReqEtradefbk);
/**
......@@ -27,7 +27,7 @@ public interface InnerEjsServer {
* @param innerReqHrztcx
* @return
*/
@PostMapping("/hrztcx")
@PostMapping("/jk/hrztcx")
public InnerRes<InnerResHrztcx> callTcx(InnerReq<InnerReqHrztcx> innerReqHrztcx);
/**
......@@ -36,7 +36,7 @@ public interface InnerEjsServer {
* @param innerReqEtradeSyncxm
* @return
*/
@PostMapping("/etradeSyncxm")
@PostMapping("/jk/etradeSyncxm")
public InnerRes<InnerResEtradeSyncxm> callEtradeSyncxm(InnerReq<InnerReqEtradeSyncxm> innerReqEtradeSyncxm);
/**
......@@ -45,7 +45,7 @@ public interface InnerEjsServer {
* @param innerReqEtradeGe34
* @return
*/
@PostMapping("/etradeGe34")
@PostMapping("/jk/etradeGe34")
public InnerRes<InnerResEtradeGe34> callEtradeGe34(InnerReq<InnerReqEtradeGe34> innerReqEtradeGe34);
/**
......@@ -54,6 +54,6 @@ public interface InnerEjsServer {
* @param innerReqEtradeGe39
* @return
*/
@PostMapping("/etradeGe39")
@PostMapping("/jk/etradeGe39")
public InnerRes<InnerResEtradeGe39> callEtradeGe39(InnerReq<InnerReqEtradeGe39> innerReqEtradeGe39);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerEmbfeServer.java
......@@ -21,7 +21,7 @@ public interface InnerEmbfeServer {
* @param innerReqDzw1
* @return
*/
@PostMapping("/DZW1")
@PostMapping("/jk/DZW1")
InnerRes<InnerResDzw1> callDZW1(InnerReq<InnerReqDzw1> innerReqDzw1);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerGmgfServer.java
......@@ -18,7 +18,7 @@ public interface InnerGmgfServer {
* @param innerReqGe57
* @return
*/
@PostMapping("/GE57")
@PostMapping("/jk/GE57")
InnerRes<InnerResGe57> callGe57(InnerReq<InnerReqGe57> innerReqGe57);
/**
......@@ -27,7 +27,7 @@ public interface InnerGmgfServer {
* @param innerReqGe59
* @return
*/
@PostMapping("/GE59")
@PostMapping("/jk/GE59")
InnerRes<InnerResGe59> callGe59(InnerReq<InnerReqGe59> innerReqGe59);
/**
......@@ -36,7 +36,7 @@ public interface InnerGmgfServer {
* @param innerReqGe67
* @return
*/
@PostMapping("/GE67")
@PostMapping("/jk/GE67")
InnerRes<InnerResGe67> callGe67(InnerReq<InnerReqGe67> innerReqGe67);
/**
......@@ -45,6 +45,6 @@ public interface InnerGmgfServer {
* @param innerReqGe69
* @return
*/
@PostMapping("/GE69")
@PostMapping("/jk/GE69")
InnerRes<InnerResGe69> callGe69(InnerReq<InnerReqGe69> innerReqGe69);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerHxServer.java
......@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
*
* @restApi
*/
//@RequestMapping("/jk")
public interface InnerHxServer {
/**
* 0208 账号查询
......@@ -18,7 +16,7 @@ public interface InnerHxServer {
* @param innerReq0208
* @return
*/
@PostMapping("/0208")
@PostMapping("/jk/0208")
InnerRes<InnerRes0208> call0208(InnerReq<InnerReq0208> innerReq0208);
/**
......@@ -27,7 +25,7 @@ public interface InnerHxServer {
* @param innerReq4309
* @return
*/
@PostMapping("/4309")
@PostMapping("/jk/4309")
InnerRes<InnerRes4309> call4309(InnerReq<InnerReq4309> innerReq4309);
/**
......@@ -36,7 +34,7 @@ public interface InnerHxServer {
* @param innerReq6311
* @return
*/
@PostMapping("/6311")
@PostMapping("/jk/6311")
InnerRes<InnerRes6311> call6311(InnerReq<InnerReq6311> innerReq6311);
/**
......@@ -45,7 +43,7 @@ public interface InnerHxServer {
* @param innerReq6157
* @return
*/
@PostMapping("/6157")
@PostMapping("/jk/6157")
InnerRes<InnerRes6157> call6157(InnerReq<InnerReq6157> innerReq6157);
/**
......@@ -54,7 +52,7 @@ public interface InnerHxServer {
* @param innerReq2571
* @return
*/
@PostMapping("/2571")
@PostMapping("/jk/2571")
InnerRes<InnerRes2571> call2571(InnerReq<InnerReq2571> innerReq2571);
/**
......@@ -63,7 +61,7 @@ public interface InnerHxServer {
* @param innerReq9011
* @return
*/
@PostMapping("/9011")
@PostMapping("/jk/9011")
InnerRes<InnerRes9011> call9011(InnerReq<InnerReq9011> innerReq9011);
/**
......@@ -72,7 +70,7 @@ public interface InnerHxServer {
* @param innerReq4102
* @return
*/
@PostMapping("/4102")
@PostMapping("/jk/4102")
InnerRes<InnerRes4102> call4102(InnerReq<InnerReq4102> innerReq4102);
/**
......@@ -81,7 +79,7 @@ public interface InnerHxServer {
* @param innerReq4203
* @return
*/
@PostMapping("/4203")
@PostMapping("/jk/4203")
InnerRes<InnerRes4203> call4203(InnerReq<InnerReq4203> innerReq4203);
/**
......@@ -90,7 +88,7 @@ public interface InnerHxServer {
* @param innerReq4316
* @return
*/
@PostMapping("/4316")
@PostMapping("/jk/4316")
InnerRes<InnerRes4316> call4316(InnerReq<InnerReq4316> innerReq4316);
......@@ -100,7 +98,7 @@ public interface InnerHxServer {
* @param innerReq4317
* @return
*/
@PostMapping("/4317")
@PostMapping("/jk/4317")
InnerRes<InnerRes4317> call4317(InnerReq<InnerReq4317> innerReq4317);
......@@ -110,7 +108,7 @@ public interface InnerHxServer {
* @param innerReq4338
* @return
*/
@PostMapping("/4338")
@PostMapping("/jk/4338")
InnerRes<InnerRes4338> call4338(InnerReq<InnerReq4338> innerReq4338);
......@@ -120,7 +118,7 @@ public interface InnerHxServer {
* @param innerReq4370
* @return
*/
@PostMapping("/4370")
@PostMapping("/jk/4370")
InnerRes<InnerRes4370> call4370(InnerReq<InnerReq4370> innerReq4370);
......@@ -130,7 +128,7 @@ public interface InnerHxServer {
* @param innerReq8003
* @return
*/
@PostMapping("/8003")
@PostMapping("/jk/8003")
InnerRes<InnerRes8003> call8003(InnerReq<InnerReq8003> innerReq8003);
......@@ -140,7 +138,7 @@ public interface InnerHxServer {
* @param innerReq9509
* @return
*/
@PostMapping("/9509")
@PostMapping("/jk/9509")
InnerRes<InnerRes9509> call9509(InnerReq<InnerReq9509> innerReq9509);
/**
......@@ -149,7 +147,7 @@ public interface InnerHxServer {
* @param innerReq7704
* @return
*/
@PostMapping("/7704")
@PostMapping("/jk/7704")
InnerRes<InnerRes7704> call7704(InnerReq<InnerReq7704> innerReq7704);
/**
......@@ -159,7 +157,7 @@ public interface InnerHxServer {
* @param innerReq7794
* @return
*/
@PostMapping("/7794")
@PostMapping("/jk/7794")
InnerRes<InnerRes7794> call7794(InnerReq<InnerReq7794> innerReq7794);
/**
......@@ -168,7 +166,7 @@ public interface InnerHxServer {
* @param innerReq7708
* @return
*/
@PostMapping("/7708")
@PostMapping("/jk/7708")
InnerRes<InnerRes7708> call7708(InnerReq<InnerReq7708> innerReq7708);
......@@ -178,7 +176,7 @@ public interface InnerHxServer {
* @param innerReq7759
* @return
*/
@PostMapping("/7759")
@PostMapping("/jk/7759")
InnerRes<InnerCommpose7759Res> call7759(InnerReq<InnerReq7759> innerReq7759);
......@@ -188,7 +186,7 @@ public interface InnerHxServer {
* @param innerReq6153
* @return
*/
@PostMapping("/6153")
@PostMapping("/jk/6153")
InnerRes<InnerCommpose6153Res> call6153(InnerReq<InnerReq6153> innerReq6153);
......@@ -198,7 +196,7 @@ public interface InnerHxServer {
* @param innerReq5006
* @return
*/
@PostMapping("/5006")
@PostMapping("/jk/5006")
InnerRes<InnerRes5006> call5006(InnerReq<InnerReq5006> innerReq5006);
......@@ -208,7 +206,7 @@ public interface InnerHxServer {
* @param innerReq8002
* @return
*/
@PostMapping("/8002")
@PostMapping("/jk/8002")
InnerRes<InnerCommpose8002Res> call8002(InnerReq<InnerReq8002> innerReq8002);
/**
......@@ -217,7 +215,7 @@ public interface InnerHxServer {
* @param innerReq8129
* @return
*/
@PostMapping("/8129")
@PostMapping("/jk/8129")
InnerRes<InnerRes8129> call8129(InnerReq<InnerReq8129> innerReq8129);
/**
......@@ -226,7 +224,7 @@ public interface InnerHxServer {
* @param innerReq8023
* @return
*/
@PostMapping("/8023")
@PostMapping("/jk/8023")
InnerRes<InnerRes8023> call8023(InnerReq<InnerReq8023> innerReq8023);
/**
......@@ -235,7 +233,7 @@ public interface InnerHxServer {
* @param innerReq8091
* @return
*/
@PostMapping("/8091")
@PostMapping("/jk/8091")
InnerRes<InnerRes8091> call8091(InnerReq<InnerReq8091> innerReq8091);
/**
......@@ -244,7 +242,7 @@ public interface InnerHxServer {
* @param innerReq8760
* @return
*/
@PostMapping("/8760")
@PostMapping("/jk/8760")
InnerRes<InnerRes8760> call8760(InnerReq<InnerReq8760> innerReq8760);
/**
......@@ -253,7 +251,7 @@ public interface InnerHxServer {
* @param innerReq9215
* @return
*/
@PostMapping("/9215")
@PostMapping("/jk/9215")
InnerRes<InnerRes9215> call9215(InnerReq<InnerReq9215> innerReq9215);
......@@ -263,7 +261,7 @@ public interface InnerHxServer {
* @param innerReqC017
* @return
*/
@PostMapping("/C017")
@PostMapping("/jk/C017")
InnerRes<InnerResC017> callC017(InnerReq<InnerReqC017> innerReqC017);
/**
......@@ -272,7 +270,7 @@ public interface InnerHxServer {
* @param innerReq8590
* @return
*/
@PostMapping("/8590")
@PostMapping("/jk/8590")
InnerRes<InnerRes8590> call8590(InnerReq<InnerReq8590> innerReq8590);
/**
......@@ -281,7 +279,7 @@ public interface InnerHxServer {
* @param innerReq8915
* @return
*/
@PostMapping("/8915")
@PostMapping("/jk/8915")
InnerRes<InnerRes8915> call8915(InnerReq<InnerReq8915> innerReq8915);
/**
......@@ -290,7 +288,7 @@ public interface InnerHxServer {
* @param innerReq8910
* @return
*/
@PostMapping("/8910")
@PostMapping("/jk/8910")
InnerRes<InnerCommpose8910Res> call8910(InnerReq<InnerReq8910> innerReq8910);
/**
......@@ -299,7 +297,7 @@ public interface InnerHxServer {
* @param innerReq8437
* @return
*/
@PostMapping("/8437")
@PostMapping("/jk/8437")
InnerRes<InnerRes8437> call8437(InnerReq<InnerReq8437> innerReq8437);
/**
......@@ -308,7 +306,7 @@ public interface InnerHxServer {
* @param innerReq8995
* @return
*/
@PostMapping("/8995")
@PostMapping("/jk/8995")
InnerRes<InnerRes8995> call8995(InnerReq<InnerReq8995> innerReq8995);
/**
......@@ -317,7 +315,7 @@ public interface InnerHxServer {
* @param innerReq8752
* @return
*/
@PostMapping("/8752")
@PostMapping("/jk/8752")
InnerRes<InnerRes8752> call8752(InnerReq<InnerReq8752> innerReq8752);
/**
......@@ -326,7 +324,7 @@ public interface InnerHxServer {
* @param innerReq8755
* @return
*/
@PostMapping("/8755")
@PostMapping("/jk/8755")
InnerRes<InnerRes8755> call8755(InnerReq<InnerReq8755> innerReq8755);
......@@ -336,7 +334,7 @@ public interface InnerHxServer {
* @param innerReq8150
* @return
*/
@PostMapping("/8150")
@PostMapping("/jk/8150")
InnerRes<InnerCommpose8150Res> call8150(InnerReq<InnerReq8150> innerReq8150);
/**
......@@ -345,7 +343,7 @@ public interface InnerHxServer {
* @param innerReq8416
* @return
*/
@PostMapping("/8416")
@PostMapping("/jk/8416")
InnerRes<InnerCommpose8416Res> call8416(InnerReq<InnerReq8416> innerReq8416);
/**
......@@ -354,7 +352,7 @@ public interface InnerHxServer {
* @param innerReq8452
* @return
*/
@PostMapping("/8452")
@PostMapping("/jk/8452")
InnerRes<InnerRes8452> call8452(InnerReq<InnerReq8452> innerReq8452);
/**
......@@ -363,7 +361,7 @@ public interface InnerHxServer {
* @param innerReq8485
* @return
*/
@PostMapping("/8485")
@PostMapping("/jk/8485")
InnerRes<InnerRes8485> call8485(InnerReq<InnerReq8485> innerReq8485);
/**
......@@ -372,7 +370,7 @@ public interface InnerHxServer {
* @param innerReq8159
* @return
*/
@PostMapping("/8159")
@PostMapping("/jk/8159")
InnerRes<InnerRes8159> call8159(InnerReq<InnerReq8159> innerReq8159);
/**
......@@ -381,7 +379,7 @@ public interface InnerHxServer {
* @param innerReq8758
* @return
*/
@PostMapping("/8758")
@PostMapping("/jk/8758")
InnerRes<InnerRes8758> call8758(InnerReq<InnerReq8758> innerReq8758);
/**
......@@ -390,7 +388,7 @@ public interface InnerHxServer {
* @param innerReq8680
* @return
*/
@PostMapping("/8680")
@PostMapping("/jk/8680")
InnerRes<InnerRes8680> call8680(InnerReq<InnerReq8680> innerReq8680);
/**
......@@ -399,7 +397,7 @@ public interface InnerHxServer {
* @param InnerReq6107
* @return
*/
@PostMapping("/6107")
@PostMapping("/jk/6107")
InnerRes<InnerRes6107> call6107(InnerReq<InnerReq6107> InnerReq6107);
/**
......@@ -408,7 +406,7 @@ public interface InnerHxServer {
* @param InnerReq6153
* @return
*/
@PostMapping("/6153_1")
@PostMapping("/jk/6153_1")
InnerRes<InnerRes6153> call6153_1(InnerReq<InnerReq6153> InnerReq6153);
/**
......@@ -417,7 +415,7 @@ public interface InnerHxServer {
* @param innerReq615377597788
* @return
*/
@PostMapping("/615377597788")
@PostMapping("/jk/615377597788")
InnerRes<InnerCommpose615377597788Res> call615377597788(InnerReq<InnerReq615377597788> innerReq615377597788);
/**
......@@ -426,7 +424,7 @@ public interface InnerHxServer {
* @param innerReq615377598416
* @return
*/
@PostMapping("/615377598416")
@PostMapping("/jk/615377598416")
InnerRes<InnerCommpose615377598416Res> call615377598416(InnerReq<InnerReq615377598416> innerReq615377598416);
/**
......@@ -435,7 +433,7 @@ public interface InnerHxServer {
* @param InnerReq8913
* @return
*/
@PostMapping("/8913")
@PostMapping("/jk/8913")
InnerRes<InnerRes8913> call8913(InnerReq<InnerReq8913> InnerReq8913);
/**
......@@ -444,7 +442,7 @@ public interface InnerHxServer {
* @param InnerReq8010
* @return
*/
@PostMapping("/8010")
@PostMapping("/jk/8010")
InnerRes<InnerRes8010> call8010(InnerReq<InnerReq8010> InnerReq8010);
/**
......@@ -453,7 +451,7 @@ public interface InnerHxServer {
* @param InnerReq8110
* @return
*/
@PostMapping("/8110")
@PostMapping("/jk/8110")
InnerRes<InnerRes8110> call8110(InnerReq<InnerReq8110> InnerReq8110);
/**
......@@ -462,7 +460,7 @@ public interface InnerHxServer {
* @param InnerReq8486
* @return
*/
@PostMapping("/8486")
@PostMapping("/jk/8486")
InnerRes<InnerRes8486> call8486(InnerReq<InnerReq8486> InnerReq8486);
/**
......@@ -471,7 +469,7 @@ public interface InnerHxServer {
* @param InnerReq1640
* @return
*/
@PostMapping("/1640")
@PostMapping("/jk/1640")
InnerRes<InnerRes1640> call1640(InnerReq<InnerReq1640> InnerReq1640);
/**
......@@ -480,7 +478,7 @@ public interface InnerHxServer {
* @param InnerReq1642
* @return
*/
@PostMapping("/1642")
@PostMapping("/jk/1642")
InnerRes<InnerRes1642> call1642(InnerReq<InnerReq1642> InnerReq1642);
/**
......@@ -489,7 +487,7 @@ public interface InnerHxServer {
* @param InnerReq1643
* @return
*/
@PostMapping("/1643")
@PostMapping("/jk/1643")
InnerRes<InnerRes1643> call1643(InnerReq<InnerReq1643> InnerReq1643);
/**
......@@ -498,7 +496,7 @@ public interface InnerHxServer {
* @param InnerReq1649
* @return
*/
@PostMapping("/1649")
@PostMapping("/jk/1649")
InnerRes<InnerRes1649> call1649(InnerReq<InnerReq1649> InnerReq1649);
/**
......@@ -507,7 +505,7 @@ public interface InnerHxServer {
* @param InnerReq1654
* @return
*/
@PostMapping("/1654")
@PostMapping("/jk/1654")
InnerRes<InnerRes1654> call1654(InnerReq<InnerReq1654> InnerReq1654);
/**
......@@ -516,7 +514,7 @@ public interface InnerHxServer {
* @param InnerReq1655
* @return
*/
@PostMapping("/1655")
@PostMapping("/jk/1655")
InnerRes<InnerRes1655> call1655(InnerReq<InnerReq1655> InnerReq1655);
/**
......@@ -525,7 +523,7 @@ public interface InnerHxServer {
* @param InnerReq1697
* @return
*/
@PostMapping("/1697")
@PostMapping("/jk/1697")
InnerRes<InnerRes1697> call1697(InnerReq<InnerReq1697> InnerReq1697);
/**
......@@ -534,6 +532,6 @@ public interface InnerHxServer {
* @param InnerReq1693
* @return
*/
@PostMapping("/1693")
@PostMapping("/jk/1693")
InnerRes<InnerRes1693> call1693(InnerReq<InnerReq1693> InnerReq1693);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerOcrServer.java
......@@ -18,7 +18,7 @@ public interface InnerOcrServer {
* @param req
* @return
*/
@PostMapping("/ocr/recognize")
@PostMapping("/jk/ocr/recognize")
InnerRes<InnerResOcrRecognize> callOcrRecognize(InnerReq<InnerReqOcrRecognize> req);
/**
......@@ -27,33 +27,33 @@ public interface InnerOcrServer {
* @param req
* @return
*/
@PostMapping("/ocr/textdiff")
@PostMapping("/jk/ocr/textdiff")
InnerRes<InnerResTextDiff> callTextDiff(InnerReq<InnerReqTextDiff> req);
@PostMapping("/ocr/textresult")
@PostMapping("/jk/ocr/textresult")
InnerRes<InnerResTextResult> callTextResult(InnerReq<InnerReqTextResult> req);
@PostMapping("/ocr/syntextdiff")
@PostMapping("/jk/ocr/syntextdiff")
InnerRes<InnerResTextResult> callSynTextResult(InnerReq<InnerReqTextDiff> req);
/**
* 发票影像下载入库
*/
@PostMapping("/ocr/fapRecognize")
@PostMapping("/jk/ocr/fapRecognize")
InnerRes<InnerResFapRecognize> callFapRecognize(InnerReq<InnerReqFapRecognize> req);
/**
* 发票影像识别
*/
@PostMapping("/ocr/fapOcr")
@PostMapping("/jk/ocr/fapOcr")
InnerRes<InnerResFapOcr> callFapOcr(InnerReq<InnerReqFapOcr> req);
/**
* 发票影像下载并ocr识别
*/
@PostMapping("/ocr/fapDownAndOcr")
@PostMapping("/jk/ocr/fapDownAndOcr")
InnerRes<InnerResFapDownAndOcr> callFapDownAndOcr(InnerReq<InnerReqFapDownAndOcr> req);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerPhServer.java
......@@ -18,7 +18,7 @@ public interface InnerPhServer {
* @param innerReqYptBhwb1
* @return
*/
@PostMapping("/bhwb1")
@PostMapping("/jk/bhwb1")
InnerRes<InnerResYptBhwb1> callBhwb1(InnerReq<InnerReqYptBhwb1> innerReqYptBhwb1);
/**
......@@ -27,7 +27,7 @@ public interface InnerPhServer {
* @param innerReqYptBhwb1Snd
* @return
*/
@PostMapping("/bhwb1snd")
@PostMapping("/jk/bhwb1snd")
InnerRes<InnerResYptBhwb1Snd> callBhwb1Snd(InnerReq<InnerReqYptBhwb1Snd> innerReqYptBhwb1Snd);
/**
......@@ -36,7 +36,7 @@ public interface InnerPhServer {
* @param innerReqYptBhwb2
* @return
*/
@PostMapping("/bhwb2")
@PostMapping("/jk/bhwb2")
InnerRes<InnerResYptBhwb2> callBhwb2(InnerReq<InnerReqYptBhwb2> innerReqYptBhwb2);
/**
......@@ -45,7 +45,7 @@ public interface InnerPhServer {
* @param innerReqYptBhwb3
* @return
*/
@PostMapping("/bhwb3")
@PostMapping("/jk/bhwb3")
InnerRes<InnerResYptBhwb3> callBhwb3(InnerReq<InnerReqYptBhwb3> innerReqYptBhwb3);
/**
......@@ -54,7 +54,7 @@ public interface InnerPhServer {
* @param innerReqDownloadfile
* @return
*/
@PostMapping("/Downloadfile")
@PostMapping("/jk/Downloadfile")
InnerRes<InnerResDownloadfile> callDownloadfile(InnerReq<InnerReqDownloadfile> innerReqDownloadfile);
/**
......@@ -63,7 +63,7 @@ public interface InnerPhServer {
* @param innerReqYptBhwb3Snd
* @return
*/
@PostMapping("/bhwb3Snd")
@PostMapping("/jk/bhwb3Snd")
InnerRes<InnerResBhwb3Snd> callBhwb3Snd(InnerReq<InnerReqYptBhwb3> innerReqYptBhwb3Snd);
/**
......@@ -72,7 +72,7 @@ public interface InnerPhServer {
* @param InnerReqBhwbSz
* @return
*/
@PostMapping("/bhwbSz")
@PostMapping("/jk/bhwbSz")
InnerRes<InnerResBhwbSz> callBhwbSz(InnerReq<InnerReqBhwbSz> InnerReqBhwbSz);
/**
......@@ -81,7 +81,7 @@ public interface InnerPhServer {
* @param innerReqPack2mf
* @return
*/
@PostMapping("/pack2mft")
@PostMapping("/jk/pack2mft")
InnerRes<InnerResPack2mft> callPack2mft(InnerReq<InnerReqPack2mft> innerReqPack2mf);
/**
......@@ -90,7 +90,7 @@ public interface InnerPhServer {
* @param innerReqFTW1
* @return
*/
@PostMapping("/ftw1")
@PostMapping("/jk/ftw1")
InnerRes<InnerResFTW1> callFtw1(InnerReq<InnerReqFTW1> innerReqFTW1);
......@@ -98,12 +98,12 @@ public interface InnerPhServer {
* @param innerReqLcw1InnerReq
* @return
*/
@PostMapping("/LCW1")
@PostMapping("/jk/LCW1")
InnerRes<InnerResLcw1> callLcw1(InnerReq<InnerReqLcw1> innerReqLcw1InnerReq);
@PostMapping("/LCW2")
@PostMapping("/jk/LCW2")
InnerRes<InnerResLcw2> callLcw2(InnerReq<InnerReqLcw2> innerReq);
@PostMapping("/GjYbwxz")
@PostMapping("/jk/GjYbwxz")
InnerRes<InnerResGjYbwxz> callGjYbwxz(InnerReq<InnerReqGjYbwxz> innerReq);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerReportServer.java
......@@ -13,21 +13,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
//@RequestMapping("/jk")
public interface InnerReportServer {
@PostMapping("/dbainsert")
@PostMapping("/jk/dbainsert")
InnerRes<InnerResDbainsert> callDbainsert(InnerReq<InnerReqDbainsert> innerReqDbainsertInnerReq);
@PostMapping("/dbbinsert")
@PostMapping("/jk/dbbinsert")
InnerRes<InnerResDbbinsert> callDbbinsert(InnerReq<InnerReqDbbinsert> innerReqDbbinsertInnerReq);
@PostMapping("/dbcinsert")
@PostMapping("/jk/dbcinsert")
InnerRes<InnerResDbcinsert> callDbcinsert(InnerReq<InnerReqDbcinsert> innerReqDbcinsertInnerReq);
@PostMapping("/dbdinsert")
@PostMapping("/jk/dbdinsert")
InnerRes<InnerResDbdinsert> callDbdinsert(InnerReq<InnerReqDbdinsert> innerReqDbdinsertInnerReq);
@PostMapping("/dbeinsert")
@PostMapping("/jk/dbeinsert")
InnerRes<InnerResDbeinsert> callDbeinsert(InnerReq<InnerReqDbeinsert> innerReqDbeinsertInnerReq);
@PostMapping("/dbfinsert")
@PostMapping("/jk/dbfinsert")
InnerRes<InnerResDbfinsert> callDbfinsert(InnerReq<InnerReqDbfinsert> innerReqDbfinsertInnerReq);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerRwmsServer.java
......@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @restApi
*/
//@RequestMapping("/jk")
public interface InnerRwmsServer {
/**
* RW02 预警灰名单响应
......@@ -21,6 +20,6 @@ public interface InnerRwmsServer {
* @param innerReqRW02
* @return
*/
@PostMapping("/RW02")
@PostMapping("/jk/RW02")
InnerRes<InnerResRW02> callRW02(InnerReq<InnerReqRW02> innerReqRW02);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerServer.java
......@@ -11,8 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @restApi
*/
//@RequestMapping("/jk")
public interface InnerServer {
@PostMapping("/inner")
@PostMapping("/jk/inner")
public InnerRes callInterface(InnerReq innerReq);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerTymdServer.java
......@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @restApi
*/
//@RequestMapping("/jk")
//@RequestMapping("")
public interface InnerTymdServer {
/**
* E200 统一名单筛查接口调用响应
......@@ -18,7 +18,7 @@ public interface InnerTymdServer {
* @param innerReqE200
* @return
*/
@PostMapping("/E200")
@PostMapping("/jk/E200")
InnerRes<InnerResE200> callE200(InnerReq<InnerReqE200> innerReqE200);
/**
......@@ -27,6 +27,6 @@ public interface InnerTymdServer {
* @param innerReqDU01
* @return
*/
@PostMapping("/DU01")
@PostMapping("/jk/DU01")
InnerRes<InnerResDU01> callDU01(InnerReq<InnerReqDU01> innerReqDU01);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerWaishuServer.java
......@@ -18,7 +18,7 @@ public interface InnerWaishuServer {
* @param innerReqFapiaoChayan
* @return
*/
@PostMapping("/fapiao/chayan")
@PostMapping("/jk/fapiao/chayan")
InnerRes<InnerResFapiaoChayan> callChayan(InnerReq<InnerReqFapiaoChayan> innerReqFapiaoChayan);
/**
......@@ -27,7 +27,7 @@ public interface InnerWaishuServer {
* @param innerReqFapiaoJiankong
* @return
*/
@PostMapping("/fapiao/jiankong")
@PostMapping("/jk/fapiao/jiankong")
InnerRes<InnerResFapiaoJiankong> callJiankong(InnerReq<InnerReqFapiaoJiankong> innerReqFapiaoJiankong);
/**
......@@ -36,6 +36,6 @@ public interface InnerWaishuServer {
* @param innerReqFapiaoChayan
* @return
*/
@PostMapping("/fapiao/ns11")
@PostMapping("/jk/fapiao/ns11")
InnerRes<InnerResFapiaoChayan> callNs11(InnerReq<InnerReqFapiaoChayan> innerReqFapiaoChayan);
}
isc-common-esb/src/main/java/com/brilliance/isc/esb/api/inner/InnerWhjServer.java
......@@ -19,7 +19,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/whj")
@PostMapping("/jk/whj")
InnerRes<InnerResWhj> callWhj(InnerReq<InnerReqWhj> req);
/**
......@@ -28,7 +28,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/accept")
@PostMapping("/jk/tax/accept")
InnerRes<InnerResTax> callTaxaccept(InnerReq<InnerReqTaxaccept> req);
/**
......@@ -37,7 +37,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/cancel")
@PostMapping("/jk/tax/cancel")
InnerRes<InnerResTax> callTaxcancel(InnerReq<InnerReqTaxcancel> req);
/**
......@@ -46,7 +46,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/check")
@PostMapping("/jk/tax/check")
InnerRes<InnerResTax> callTaxcheck(InnerReq<InnerReqTaxcheck> req);
/**
......@@ -55,7 +55,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/confirm")
@PostMapping("/jk/tax/confirm")
InnerRes<InnerResTax> callTaxconfirm(InnerReq<InnerReqTaxconfirm> req);
/**
......@@ -64,7 +64,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/modify")
@PostMapping("/jk/tax/modify")
InnerRes<InnerResTax> callTaxmodify(InnerReq<InnerReqTaxmodify> req);
/**
......@@ -73,7 +73,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/qrydetail")
@PostMapping("/jk/tax/qrydetail")
InnerRes<InnerResTax> callTaxqrydetail(InnerReq<InnerReqTaxqrydetail> req);
/**
......@@ -82,7 +82,7 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/qrylist")
@PostMapping("/jk/tax/qrylist")
InnerRes<InnerResTax> callTaxqrylist(InnerReq<InnerReqTaxqrylist> req);
/**
......@@ -91,6 +91,6 @@ public interface InnerWhjServer {
* @param req
* @return
*/
@PostMapping("/tax/retry")
@PostMapping("/jk/tax/retry")
InnerRes<InnerResTax> callTaxretry(InnerReq<InnerReqTaxretry> req);
}
isc-common-service/pom.xml
......@@ -39,6 +39,11 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.brilliance.isc</groupId>
<artifactId>isc-customized</artifactId>
<version>3.1.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.camel.springboot</groupId>-->
<!-- <artifactId>camel-spring-boot-starter</artifactId>-->
......
isc-common-service/src/main/java/com/brilliance/isc/common/cache/pty/PtyCacheServiceImpl.java
......@@ -7,7 +7,6 @@ import com.brilliance.isc.common.context.SettleContext;
import com.brilliance.isc.common.util.StringUtils;
import com.brilliance.isc.mda.dao.EtyMapper;
import com.brilliance.isc.mda.dao.PtyMapper;
import com.brilliance.mda.runtime.mda.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,34 +37,25 @@ public class PtyCacheServiceImpl implements PtyCacheService {
@Autowired
private PtyMapper ptyMapper;
@Autowired
private EtyMapper etyMapper;
// @PostConstruct
// public void initOwnPty() {
// ownPty = ptyMapper.queryDetailByExtkey("EVERCNBJXXX");
// //验证环境 bic第8位都改成了0
// if (ownPty == null) {
// ownPty = ptyMapper.queryDetailByExtkey("EVERCNB0XXX");
// }
// }
public Pty getOwnPty() {
String ownbic = Constants.NULLSTR;
Ety ety = SettleContext.getUserSession().getEty();
if (Objects.isNull(ety)) {
Ety ety = SettleContext.getUserEty();
if(Objects.isNull(ety)){
Usr usr = SettleContext.getUserSession().getUsr();
if (Objects.nonNull(usr) && StringUtils.isNotEmpty(usr.getEtyextkey())) {
String etyextkey = usr.getEtyextkey();
ety = etyMapper.getEtyByExtkey(etyextkey);
ety = etyMapper.getEtyByExtkey(usr.getEtyextkey());
}
}
if (Objects.nonNull(ety) && StringUtils.isNotEmpty(ety.getOwnbic())) {
ownbic = ety.getOwnbic();
}
Assert.hasText(ownbic, "UserSession:usr.Etyextkey ety.Ownbic isEmpty");
Pty ownPty = ptyMapper.queryDetailByExtkey(ownbic);
Assert.notNull(ownPty, String.format("pty cannot be found by ownbic=[%s]", ownbic));
String message = String.format("请检查Usr、ETY表，确保正确配置实体信息！");
Assert.hasText(ety.getEtg(), message);
Assert.hasText(ety.getOwnbic(), message);
Pty ownPty = ptyMapper.queryOwnPty(ety.getOwnbic(),ety.getEtg());
Assert.notNull(ownPty, String.format("请检查PTY表是否正确配置了当前实体etgextkey:[%s]BA类型的PTY信息!",ety.getEtg()));
return ownPty;
}
......
isc-common-service/src/main/java/com/brilliance/isc/common/component/ActmodComponent.java
......@@ -5,6 +5,8 @@ import com.brilliance.isc.bo.Trm;
import com.brilliance.isc.common.api.bch.service.BchService;
import com.brilliance.isc.common.codetable.service.CodetableService;
import com.brilliance.isc.common.context.SettleContext;
import com.brilliance.isc.common.context.SpringEnvContext;
import com.brilliance.isc.customized.api.AccountCustomizedApi;
import com.brilliance.isc.mda.dao.TrmMapper;
import com.brilliance.mda.runtime.mda.impl.Argument;
import com.brilliance.mda.runtime.mda.util.MdaUtils;
......@@ -62,8 +64,12 @@ public class ActmodComponent {
if (length == 20 && MdaUtils.compareTo(Strings.mid(account, 1, 3), "NRA") == 0) {
return checkAccount(Strings.mid(account, 4, 17), term_id, branch, cur, manFLG, err);
} else {
if (length != 17 && length != 21) {
err.value = "账号位数错误";
// if (length != 17 && length != 21) {
// err.value = "账号位数错误";
// return false;
// }
AccountCustomizedApi api = SpringEnvContext.getBean(AccountCustomizedApi.class);
if(!api.checkAccount(account,err)){
return false;
}
/**
......@@ -163,20 +169,20 @@ public class ActmodComponent {
}
//label checkEnd
//检查账号的币别位
if (!MdaUtils.isEmpty(cur)) {
if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
err.value = "记账币种 " + cur + " 与账号币种不符";
return false;
}
}
// if (!MdaUtils.isEmpty(cur)) {
// if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
// err.value = "记账币种 " + cur + " 与账号币种不符";
// return false;
// }
// }
//检查客户帐的校验位
if (MdaUtils.compareTo(repflg, "C") == 0 && MdaUtils.compareTo(Strings.mid(term_id, 1, 2), "AS") != 0) {
if (!chkActMac(account)) {
err.value = "客户帐号合法性校验错误";
// Err = "MAC[" + GetActMac( Account ) + "]," + Err
return false;
}
}
// if (MdaUtils.compareTo(repflg, "C") == 0 && MdaUtils.compareTo(Strings.mid(term_id, 1, 2), "AS") != 0) {
// if (!chkActMac(account)) {
// err.value = "客户帐号合法性校验错误";
// // Err = "MAC[" + GetActMac( Account ) + "]," + Err
// return false;
// }
// }
return true;
}
}
......@@ -199,8 +205,12 @@ public class ActmodComponent {
//---------------------------------------------
int length = Strings.len(account);
//------ZMQZMQ---------------------------------------
if (length != 17 && length != 21) {
err.value = "账号位数错误";
// if (length != 17 && length != 21) {
// err.value = "账号位数错误";
// return false;
// }
AccountCustomizedApi api = SpringEnvContext.getBean(AccountCustomizedApi.class);
if(!api.checkAccount(account,err)){
return false;
}
String vcur = Strings.mid(account, 5, 2);
......@@ -217,11 +227,14 @@ public class ActmodComponent {
endif
**/
//检查账号的币别位
if (!MdaUtils.isEmpty(cur)) {
if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
err.value = "记账币种 " + cur + " 与账号币种不符 ";
return false;
}
// if (!MdaUtils.isEmpty(cur)) {
// if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
// err.value = "记账币种 " + cur + " 与账号币种不符 ";
// return false;
// }
// }
if(!api.checkCur(cur,err)){
return false;
}
/*String vbranch = Strings.mid(account,1,4);
Map<String, Object> dyncMap = new HashMap<>();
......
isc-common-service/src/main/java/com/brilliance/isc/common/esb/account/IAccountFeign.java
......@@ -6,7 +6,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
//@RequestMapping("/webapi/jk")
public interface IAccountFeign {
@PostMapping("/webapi/jk/8091")
......
isc-common-service/src/main/java/com/brilliance/isc/common/fecmod/service/impl/FecmodServiceImpl.java
......@@ -18,12 +18,15 @@ import com.brilliance.mda.runtime.mda.impl.Argument;
import com.brilliance.mda.runtime.mda.util.Dates;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.brilliance.mda.runtime.mda.util.MdaUtils;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@Service("fecmodService")
......@@ -71,6 +74,7 @@ public class FecmodServiceImpl implements FecmodService {
}
Cty wrkCty = null;
Reg wrkReg = null;
Map<String,Object> params = Maps.newHashMap();
//根据wrkpty获取wrkcty wrkreg
if (wrkPty != null) {
if (!StringUtils.isEmpty(wrkPty.getRskcty())) {
......@@ -92,9 +96,11 @@ public class FecmodServiceImpl implements FecmodService {
fecsql += " AND LOWAMT <= " + argAmt.abs().toPlainString() + "";
fecsql += " AND HIGAMT > " + argAmt.abs().toPlainString() + "";
Date fecDate = fecRefDat == null ? Dates.today() : fecRefDat;
String rngSql = "( BEGDAT <= " + Utils.dbSqlDate(fecDate) + " AND ENDDAT > " + Utils.dbSqlDate(fecDate) + " )";
// String rngSql = "( BEGDAT <= " + Utils.dbSqlDate(fecDate) + " AND ENDDAT > " + Utils.dbSqlDate(fecDate) + " )";
String rngSql = "( BEGDAT <= #{begdat} AND ENDDAT > #{enddat} )";
params.put("begdat",fecDate);
params.put("enddat",fecDate);
fecsql += " AND " + rngSql;
String pfx = " AND (";
if( MdaUtils.isEmpty(argFeePri) )
{
......@@ -117,7 +123,9 @@ public class FecmodServiceImpl implements FecmodService {
}
fecsql = Utils.sdbEtyGenSql("FEC", fecsql);
String sql = fecsql + " ORDER BY FEEPRI DESC";
List<Fec> wrkfecList = fecMapper.selectFecByConditionSql(sql);
// List<Fec> wrkfecList = fecMapper.selectFecByConditionSql(sql);
params.put("conditionSql",sql);
List<Fec> wrkfecList = fecMapper.selectFecByConditionSqlAndParams(params);
if (wrkfecList != null && wrkfecList.size() > 0) {
//获取到默认计费规则
Fec defaultFec = null;
......
isc-common-service/src/main/java/com/brilliance/isc/common/transaction/check/LiaccvCheck.java
......@@ -3,8 +3,10 @@ package com.brilliance.isc.common.transaction.check;
import com.brilliance.isc.bo.Bch;
import com.brilliance.isc.common.codetable.service.CodetableService;
import com.brilliance.isc.common.context.SettleContext;
import com.brilliance.isc.common.context.SpringEnvContext;
import com.brilliance.isc.common.liaccv.vo.LiaccvVo;
import com.brilliance.isc.common.util.I18nUtil;
import com.brilliance.isc.customized.api.AccountCustomizedApi;
import com.brilliance.isc.mda.dao.PublicMapper;
import com.brilliance.mda.runtime.mda.impl.Argument;
import com.brilliance.mda.runtime.mda.util.*;
......@@ -420,8 +422,12 @@ public class LiaccvCheck implements ICheck<LiaccvVo> {
if (length == 20 && MdaUtils.compareTo(Strings.mid(account, 1, 3), "NRA") == 0) {
return checkAccount(Strings.mid(account, 4, 17), term_id, branch, cur, manFLG, err);
} else {
if (length != 17 && length != 21) {
err.value = "账号位数错误";
// if (length != 17 && length != 21) {
// err.value = "账号位数错误";
// return false;
// }
AccountCustomizedApi api = SpringEnvContext.getBean(AccountCustomizedApi.class);
if(!api.checkAccount(account,err)){
return false;
}
/*
......@@ -524,12 +530,15 @@ public class LiaccvCheck implements ICheck<LiaccvVo> {
}
//label checkEnd
//检查账号的币别位
if (!MdaUtils.isEmpty(cur)) {
if (MdaUtils.compareTo(vcur,
Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
err.value = "记账币种 " + cur + " 与账号币种不符 ";
return false;
}
// if (!MdaUtils.isEmpty(cur)) {
// if (MdaUtils.compareTo(vcur,
// Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
// err.value = "记账币种 " + cur + " 与账号币种不符 ";
// return false;
// }
// }
if(!api.checkCur(cur,err)){
return false;
}
//检查客户帐的校验位
if (MdaUtils.compareTo(repflg, "C") == 0 && MdaUtils.compareTo(Strings.mid(term_id, 1, 2), "AS") != 0) {
......@@ -562,8 +571,12 @@ public class LiaccvCheck implements ICheck<LiaccvVo> {
//---------------------------------------------
int length = Strings.len(account);
//------ZMQZMQ---------------------------------------
if (length != 17 && length != 21) {
err.value = "账号位数错误";
// if (length != 17 && length != 21 && length != 18 && length != 22) {
// err.value = "账号位数错误";
// return false;
// }
AccountCustomizedApi api = SpringEnvContext.getBean(AccountCustomizedApi.class);
if(!api.checkAccount(account,err)){
return false;
}
String vcur = Strings.mid(account, 5, 2);
......@@ -580,11 +593,14 @@ public class LiaccvCheck implements ICheck<LiaccvVo> {
endif
*/
//检查账号的币别位
if (!MdaUtils.isEmpty(cur)) {
if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
err.value = "记账币种 " + cur + " 与账号币种不符 ";
return false;
}
// if (!MdaUtils.isEmpty(cur)) {
// if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
// err.value = "记账币种 " + cur + " 与账号币种不符 ";
// return false;
// }
// }
if(!api.checkCur(cur,err)){
return false;
}
String vbranch = Strings.mid(account, 1, 4);
Map<String, Object> sqlMap = new HashMap<>();
......
isc-common-service/src/main/java/com/brilliance/isc/common/util/Utils.java
......@@ -425,7 +425,7 @@ public class Utils {
// In both cases the rest of the command has to be put into brakets.
if (argWhrFlg) {
String upsql = argSql.toUpperCase();
sql = "WHERE " + argCon + " and ( " + argSql.substring(upsql.lastIndexOf("WHERE")+5) + " )";
sql = "WHERE " + argCon + " and ( " + argSql.substring(upsql.indexOf("WHERE")+5) + " )";
} else {
if (MdaUtils.isEmpty(argSql)) {
sql = "WHERE " + argCon;
......
isc-common-service/src/main/java/com/brilliance/isc/support/MyBatisConfig.java 0 → 100644
package com.brilliance.isc.support;
import cn.hutool.core.util.StrUtil;
import com.brilliance.isc.bo.Etg;
import com.brilliance.isc.bo.Ety;
import com.brilliance.isc.common.context.SettleContext;
import com.brilliance.isc.common.context.SettleSession;
import com.brilliance.mda.support.mybatis.interceptor.CustomParameterInterceptor;
import com.brilliance.mda.support.mybatis.interceptor.ParameterProcessor;
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.plugin.Interceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Map;
@Configuration
public class MyBatisConfig {
@Bean
public Interceptor customInterceptor() {
return new CustomParameterInterceptor(new ParameterProcessor() {
public static final String _ETY_PARAMETER_KEY = "_etyextkey";
public static final String _ETG_PARAMETER_KEY = "_etgextkey";
@Override
public Object processCustomizedParameter(MappedStatement ms, Map<String, Object> paramMap, BoundSql boundSql, CacheKey pageKey) {
SettleSession session = SettleContext.getUserSession();
Ety ety = session.getEty();
Etg etg = session.getEtg();
paramMap.put(_ETY_PARAMETER_KEY, ety.getExtkey());
paramMap.put(_ETG_PARAMETER_KEY, etg.getExtkey());
//处理pageKey
pageKey.update(ety);
pageKey.update(etg);
return paramMap;
}
/**
* 检查SettleSession中是否有对应的ETY，ETG信息
* @return
*/
@Override
public boolean checkParameter() {
SettleSession session = SettleContext.getUserSession();
if(session == null){
return false;
}
if(session.getEty() == null && session.getEtg() == null){
return false ;
}
if(StrUtil.isEmpty(session.getEty().getExtkey()) && StrUtil.isEmpty(session.getEtg().getExtkey())){
return false;
}
return true;
}
});
}
}
isc-customized/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>isc-core</artifactId>
<groupId>com.brilliance.isc</groupId>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>isc-customized</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.brilliance.isc</groupId>
<artifactId>isc-common-core</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
isc-customized/src/main/java/com/brilliance/isc/customized/acount/AccountCustomizedService.java 0 → 100644
package com.brilliance.isc.customized.acount;
import cn.hutool.core.util.StrUtil;
import com.brilliance.isc.customized.api.AccountCustomizedApi;
import com.brilliance.mda.runtime.mda.impl.Argument;
import org.springframework.stereotype.Service;
@Service
public class AccountCustomizedService implements AccountCustomizedApi {
@Override
public boolean checkAccount(String account, Argument<String> errMsg) {
if(!StrUtil.isEmpty(account)){
int length = account.length();
if(length == 17 || length == 21 || length == 18 || length == 22){
return true;
}
}
errMsg.value = "账户长度错误！";
return false;
}
@Override
public boolean checkCur(String cur, Argument<String> errMsg) {
//TODO 依据实际逻辑校验币种 以下为原有校验逻辑
// if (!MdaUtils.isEmpty(cur)) {
// if (MdaUtils.compareTo(vcur, Strings.mid(codetableService.getTblLabel(cur, "CURKEY"), 1, 2)) != 0) {
// err.value = "记账币种 " + cur + " 与账号币种不符";
// return false;
// }
// }
if(true){
return true;
}
errMsg.value = "账户长度错误！";
return false;
}
}
isc-customized/src/main/java/com/brilliance/isc/customized/api/AccountCustomizedApi.java 0 → 100644
package com.brilliance.isc.customized.api;
import com.brilliance.mda.runtime.mda.impl.Argument;
public interface AccountCustomizedApi {
/**
* 检验账号长度
* @param account
* @return
*/
boolean checkAccount(String account, Argument<String> errMsg);
/**
* 校验账号比重
* @param cur
* @param errMsg
* @return
*/
boolean checkCur(String cur,Argument<String> errMsg);
}
pom.xml
......@@ -19,6 +19,7 @@
<module>isc-common-esb</module>
<module>isc-common-counter</module>
<module>isc-common-automatic</module>
<module>isc-customized</module>
</modules>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment