FT业务BO VO拆分，修改cbsconf.ini

isc-common-core/src/main/java/com/brilliance/isc/vo/model/FtacbsVo.java

+package com.brilliance.isc.vo.model;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FtacbsVo extends AbstractCommonVo {
+    
+    private Cbb max;
+
+    private Cbb opn1;
+
+    private Cbb opn2;
+
+    private Cbb ins;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new Cbb();
+        }
+        if (ins == null) {
+            ins = new Cbb();
+        }
+        if (opn1 == null) {
+            opn1 = new Cbb();
+        }
+        if (opn2 == null) {
+            opn2 = new Cbb();
+        }
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/model/FtdVo.java

+package com.brilliance.isc.vo.model;
+
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+* TABLE:ftd:FTD - Funds Transfer Data
+ *
+ *
+*/
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class FtdVo extends AbstractCommonVo{
+
+
+        //@TDSetter(max=8)
+        private String inr = NULLSTR;
+
+        //Reference
+        //@TDSetter(max=16)
+        private String ownref = NULLSTR;
+
+        //Externally Displayed Name to Identify the Contract
+        //@TDSetter(max=40)
+        private String nam = NULLSTR;
+
+        //Date Funds Transfer Opened/Issued
+        @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+       // @TDSetter
+        private Date opndat = NULLDATE;
+
+        //Value Date
+        @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+        //@TDSetter
+        private Date valdat = NULLDATE;
+
+        //Confirmed on
+        @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+       //@TDSetter
+        private Date cnfdat = NULLDATE;
+
+        //Maturity Date
+        @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+        //@TDSetter
+        private Date matdat = NULLDATE;
+
+        //Date Closed
+        @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+        //@TDSetter
+        private Date clsdat = NULLDATE;
+
+        //Responsible User
+       // @TDSetter(max=8)
+        private String ownusr = NULLSTR;
+
+        //Version Counter
+       // @TDSetter(max=4)
+        private String ver = NULLSTR;
+
+        //Branch INR
+       // @TDSetter(max=8)
+        private String branchinr = NULLSTR;
+
+        //Branch INR
+        //@TDSetter(max=8)
+        private String bchkeyinr = NULLSTR;
+
+        //Funds Transfer Type
+      //  @TDSetter(max=2)
+        private String fttyp = NULLSTR;
+
+        //Rate per year
+      //  @TDSetter(scale=6)
+        private  BigDecimal rat  = Decimals.ZERO_SCALE6;
+
+        //Day count Fraction
+      //  @TDSetter(max=7)
+        private String cntfra = NULLSTR;
+
+        //User
+        //@TDSetter(max=8)
+        private String usr = NULLSTR;
+
+        //Bank Type
+       // @TDSetter(max=1)
+        private String bnktyp = NULLSTR;
+
+        //entity extkey
+       // @TDSetter(max=8)
+        private String etyextkey = NULLSTR;
+
+        //挂�'�编号
+       // @TDSetter(max=16)
+        private String gzno = NULLSTR;
+
+
+
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/model/FtdgrpVo.java

+package com.brilliance.isc.vo.model;
+
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FtdgrpVo extends AbstractCommonVo {
+    private FtdVo rec;
+
+    private FttVo blk;
+    private FtacbsVo cbs;
+
+    private PtsptaVo tro;
+
+    private PtsptaVo tri;
+
+    private PtsptaVo act;
+
+    private PtsptaVo ben;
+
+    private PtsptaVo apl;
+
+    private CbbVo cbb;
+
+    @Override
+    public void reset() {
+        if (rec == null) {
+            rec = new FtdVo();
+        }
+        if (cbb == null) {
+            cbb = new CbbVo();
+        }
+        if (cbs == null){
+            cbs = new FtacbsVo();
+        }
+        cbb.reset();
+        if(tro == null){
+            tro = new PtsptaVo();
+        }
+        tro.reset();
+        if(tri == null){
+            tri = new PtsptaVo();
+        }
+        tri.reset();
+        if(act == null){
+            act = new PtsptaVo();
+        }
+        act.reset();
+        if(ben == null){
+            ben = new PtsptaVo();
+        }
+        ben.reset();
+        if(apl == null){
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+
+
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/model/FttVo.java

+package com.brilliance.isc.vo.model;
+
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FttVo {
+       //Internal Unique ID of Import L/C
+
+            private String inr = NULLSTR;
+
+            //remark
+
+            private String remark = NULLSTR;
+
+            //incoming tag 72
+
+            private String contag72 = NULLSTR;
+
+            //incoming tag 79
+
+            private String contag79 = NULLSTR;
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/model/FttpVo.java

+package com.brilliance.isc.vo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FttpVo extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(FttpVo.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    //TDSetter(max=1)
+    private  String pansta = NULLSTR;
+    //Get Ref
+  //  private transient IControl butgetref = new ControlImpl("butgetref", "Get Ref", this);
+    //Trade-out Account
+    //TDSetter    (max=34)
+    private  String troact = NULLSTR;
+    //Trade-in Account TDSetter(max=34)
+    private  String triact = NULLSTR;
+    //Message Type  (max=3)
+    private  String msgtyp = NULLSTR;
+    //Ben Trade-in Account  (max=34)
+    private  String benact = NULLSTR;
+    //BANKTYP flag  (max=1)
+    private  String bnaktypflg = NULLSTR;
+
+    private Mt32m mt32m;
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/model/Mt30m.java

+package com.brilliance.isc.vo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Mt30m extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Mt30m.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    private  String pansta = null;
+    //MT300 22A - 报文功能
+    private  String s22a = null;
+    //MT300 94A - 业务范�'
+    private  String s94a = null;
+    //MT300 22C - 共同参号
+    private  String conref = null;
+    //MT300 17T - 打包交易指示
+    private  String s17t = null;
+    //MT300 17U - 分笔结算指示
+    private  String s17u = null;
+    //Delivery Agent Account
+    private  String a53act = null;
+    //Intermediary Account
+    private  String iniact = null;
+    //Receiving Agent Account
+    private  String rbcact = null;
+    //Delivery Agent Account
+    private  String b53act = null;
+    //Intermediary Account
+    private  String b56act = null;
+    //Receiving Agent Account
+    private  String owcact = null;
+    //Beneficiary Institution Account
+    private  String b58act = null;
+    //Contact Information
+    private  String coninf = null;
+    //Dealing Method
+    private  String deamet = null;
+    //Dealing Method Text
+    private  String deamettxt = null;
+    //Dealing MethodMT300 24D
+    private  String s24d = null;
+    //Broker's Commission Cur.
+    private  String comcur = null;
+    //Broker's Commission Amount
+    private BigDecimal comamt = Decimals.ZERO_SCALE3;
+    //Counterparty's Reference
+    private  String ctpref = null;
+    //Broker's Reference
+    private  String c88ref = null;
+    //Sender to Receiver Information
+    private  String str300 = null;
+    //Event Type
+    private  String enttyp = null;
+    //Reference
+    private  String sndref = null;
+    //Underlying Liability Reference
+    private  String unlref = null;
+    //Profit and Loss Srttlement Date
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date plsdat;
+    //Profit and Loss Settlement Amount CUR
+    private  String plscur = null;
+    //Profit and Loss Settlement Amount
+    private  BigDecimal plsamt = Decimals.ZERO_SCALE3;
+    //Outstanding Settlement Amount CUR
+    private  String ouscur = null;
+    //Outstanding Settlement Amount
+    private  BigDecimal ousamt = Decimals.ZERO_SCALE3;
+
+//    private Ptsp b58p;
+//
+//    private Ptsp b53p;
+//
+//    private Ptsp owcp;
+//
+//    private Ptsp b56p;
+//
+//    private Ptsp rbcp;
+//
+//    private Ptsp inip;
+//
+//    private Ptsp a53p;
+
+    private PtsptaVo b58;
+
+    private PtsptaVo b53;
+
+    private PtsptaVo owc;
+
+    private PtsptaVo b56;
+
+    private PtsptaVo rbc;
+
+    private PtsptaVo ini;
+
+    private PtsptaVo a53;
+
+    private PtsptaVo c84;
+
+    private PtsptaVo c85;
+
+    private PtsptaVo c88;
+
+    //private Ptsp c84p;
+
+    //private Ptsp c85p;
+
+    //private Ptsp c88p;
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/model/Mt32m.java

+package com.brilliance.isc.vo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Mt32m extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Mt32m.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    private  String pansta = null;
+    //MT300 22A - 报文功能
+    private  String amecur = null;
+    //Broker's Commission Amount
+    private BigDecimal ameamt = Decimals.ZERO_SCALE3;
+
+    private  String newcur = null;
+    //Broker's Commission Amount
+    private BigDecimal newamt = Decimals.ZERO_SCALE3;
+
+
+    private  String s22a = null;
+    //MT300 94A - 业务范�'
+    private  String s94a = null;
+
+    private  String s17r = null;
+
+    private  String s22b = null;
+
+
+    private  String s30x  = null;
+    private  String oldref = null;
+    private  String conref = null;
+    private  String conno = null;
+
+    private  String a53act = null;
+    private  String iniact = null;
+    private  String rbcact = null;
+    private  String a58act = null;
+
+    private  String b53act = null;
+    private  String b56act = null;
+    private  String owcact = null;
+    private  String b58act = null;
+    private  String str300 = null;
+
+    private PtsptaVo b58;
+
+    private PtsptaVo b53;
+
+    private PtsptaVo owc;
+
+    private PtsptaVo b56;
+
+
+    private PtsptaVo rbc;
+
+    private PtsptaVo ini;
+
+    private PtsptaVo a53;
+
+    private PtsptaVo a58;
+
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+
+}

isc-common-core/src/main/resources/ini/cbsconf.ini

@@ -33,6 +33,8 @@ COD31=BFD
 COD31=NID
 COD31=NCD
 COD33=FXD
+COD34=FTD
+
 [CBCCOD]
 COD1=ACRACR
 COD2=AOPSUM
@@ -53,6 +55,8 @@ COD16=RSVSUM
 COD17=SLDSUM
 COD18=SYNSUM
 COD19=UTLSUM
+COD20=INSSUM
+COD21=OPN2
 [CBTCOD]
 COD1=ACRACR
 COD2=AOPIN
@@ -77,6 +81,8 @@ COD20=SLDAMT
 COD21=SYNIN
 COD22=SYNOUT
 COD23=UTLAMT
+COD24=INSAMT
+
 [ACS-ACRACR]
 OPR1=+ACRACR
 [ACS-ACRACR-OPR]
@@ -1288,3 +1294,34 @@ UTLSUM=+
 [FXD-UTLAMT-COL]
 COD1=OPN
 COD2=UTLSUM
+
+[FTD-INSAMT]
+OPR1=+INSSUM
+[FTD-INSAMT-OPR]
+INSSUM=+
+[FTD-INSAMT-COL]
+COD1=INSSUM
+[FTD-MAXAMT]
+OPR1=+MAXSUM
+OPR2=+OPN
+[FTD-MAXAMT-OPR]
+MAXSUM=+
+OPN=+
+[FTD-MAXAMT-COL]
+COD1=MAXSUM
+COD2=OPN
+[FTD-OPNAMT]
+OPR1=+OPN2
+[FTD-OPNAMT-OPR]
+OPN2=+
+[FTD-OPNAMT-COL]
+COD1=OPN2
+[FTD-UTLAMT]
+OPR1=-OPN
+OPR2=+UTLSUM
+[FTD-UTLAMT-OPR]
+OPN=-
+UTLSUM=+
+[FTD-UTLAMT-COL]
+COD1=OPN
+COD2=UTLSUM
\ No newline at end of file

isc-common-core/src/main/resources/mapper/ftdmapper.xml

@@ -30,7 +30,7 @@
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
         select
-            <include refid="Base_Column_List" />
+        <include refid="Base_Column_List" />
         from ftd
         where inr = #{inr,jdbcType=VARCHAR}
     </select>
@@ -40,6 +40,85 @@
         where inr = #{inr,jdbcType=VARCHAR}
     </delete>
 
+<!--    资金调拨_连接cbb表查询-->
+    <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">
+    select
+        ftd.*,
+        cbb.cur,
+        cbb.amt
+    from ftd
+    join cbb on cbb.objinr = ftd.inr
+    where
+    <if test=" opndatfrom != null ">
+        ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
+    </if>
+
+    <if test=" opndatto != null ">
+        AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}
+    </if>
+    <if test=" seaownref != null and  seaownref != ''">
+        AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}
+    </if>
+
+    <if test=" nam != null and  nam != ''">
+        AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
+    </if>
+    <if test=" ownusr != null and  ownusr != ''">
+        AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}
+    </if>
+    <if test=" usr != null and  usr != ''">
+        AND ftd.usr=#{ usr,jdbcType=VARCHAR}
+    </if>
+    <if test=" fttyp != null and  fttyp != ''">
+        AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}
+    </if>
+    <if test=" gzno != null and  gzno != ''">
+        AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}
+    </if>
+    <if test="cur != null and cur != ''">
+        AND cbb.cur = #{cur,jdbcType=VARCHAR}
+    </if>
+
+    <if test=" amtmin != null and amtmin != ''">
+        AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}
+    </if>
+    <if test=" amtmax != null and amtmax != ''">
+        AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}
+    </if>
+    </select>
+    <!--本地测试-->
+<!--    <select id="query" resultMap="BaseResultMap">-->
+<!--        select <include refid="Base_Column_List" />-->
+<!--        from ftd-->
+<!--        where-->
+<!--        <if test=" opndatfrom != null ">-->
+<!--            ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}-->
+<!--        </if>-->
+
+<!--        <if test=" opndatto != null ">-->
+<!--            AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}-->
+<!--        </if>-->
+<!--        <if test=" seaownref != null and  seaownref != ''">-->
+<!--            AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}-->
+<!--        </if>-->
+
+<!--        <if test=" nam != null and  nam != ''">-->
+<!--            AND ftd.NAM=#{ nam,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test=" ownusr != null and  ownusr != ''">-->
+<!--            AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test=" usr != null and  usr != ''">-->
+<!--            AND ftd.usr=#{ usr,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test=" fttyp != null and  fttyp != ''">-->
+<!--            AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test=" gzno != null and  gzno != ''">-->
+<!--            AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--    </select>-->
+
     <insert id="insert">
         insert into ftd (<include refid="Base_Column_List" />)
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -291,7 +370,7 @@
     <select id="queryFtdInfo" resultType="com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo"
             parameterType="com.brilliance.isc.vo.funds.FttselQueryVo"></select>
 
-
+    
 </mapper>
 
 

isc-common-core/src/main/resources/mapper/fttmapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.brilliance.isc.mda.dao.FttMapper">
 
@@ -25,7 +25,7 @@
         where inr = #{inr,jdbcType=VARCHAR}
     </delete>
 
-    <insert id="insert">
+ <insert id="insert">
         insert into ftt (<include refid="Base_Column_List" />)
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{inr,jdbcType=VARCHAR},