Skip to content

S
swiftMtMx
Commit f1415941 by zhanghou
Options

修改了192,292,196,296报文的部分方法

parent 5c9c19bf
Showing with 28 additions and 33 deletions
swiftCore/src/main/java/com/brilliance/swift/mx2mt/AbstractMx2MtTagsGenerate.java
...@@ -1478,51 +1478,50 @@ public abstract class AbstractMx2MtTagsGenerate implements Mx2MtTagsGenerate { ...@@ -1478,51 +1478,50 @@ public abstract class AbstractMx2MtTagsGenerate implements Mx2MtTagsGenerate {
if (filed76.length()>0){ if (filed76.length()>0){
int count = filed76.length()/35; int count = filed76.length()/35;
int countInt = filed76.length()%35; int countInt = filed76.length()%35;
if(count>1){
count = (filed76.length()-35)/33+1;
countInt = (filed76.length()-35)%33;
}
if(count==0){ if(count==0){
sb76.append(filed76); sb76.append(filed76);
sb76.append(Mx2MtConstants.NEW_LINE).append("/UETR/").append(uetr); String str = "/UETR/" + uetr;
if(str.length()>35){
sb77A.append(str.substring(0, 35)).append(Mx2MtConstants.NEW_LINE).append("//").append(str.substring(35));
}
}else{ }else{
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (i == 0) { if (i == 0) {
String substring = filed76.substring(0, 35); String substring = filed76.substring(0, 35);
sb76.append(substring).append(Mx2MtConstants.NEW_LINE); sb76.append(substring);
} }
if (i == 1) { if (i == 1) {
String substring = filed76.substring(35, 68); String substring = filed76.substring(35, 68);
sb76.append("//").append(substring).append(Mx2MtConstants.NEW_LINE); sb76.append(Mx2MtConstants.NEW_LINE).append("//").append(substring);
} }
if (i > 1 && count <= 6) { if (i > 1 && i<6) {
String substring = filed76.substring(68 + (i - 2) * 33, 68 + (i - 1) * 33); String substring = filed76.substring(68 + (i - 2) * 33, 68 + (i - 1) * 33);
if(i+1 == 6){ sb76.append(Mx2MtConstants.NEW_LINE).append("//").append(substring);
sb76.append("//").append(substring);
}else {
sb76.append("//").append(substring).append(Mx2MtConstants.NEW_LINE);
}
} else if (i > 5) { } else if (i > 5) {
String substring = filed76.substring(68 + (i - 2) * 33, 68 + (i - 1) * 33); String substring = filed76.substring(68 + (i - 2) * 33, 68 + (i - 1) * 33);
sb77A.append("//").append(substring).append(Mx2MtConstants.NEW_LINE); sb77A.append(Mx2MtConstants.NEW_LINE).append("//").append(substring);
} }
if (i + 1 == count && countInt != 0) { if (i + 1 == count && countInt != 0) {
String substring = filed76.substring(68 + (i - 1) * 33); String substring = filed76.substring(68 + (i - 1) * 33);
if (count <= 5) { if (count <= 5) {
if(count==5){ sb76.append(Mx2MtConstants.NEW_LINE).append("//").append(substring);
sb76.append("//").append(substring);
}else {
sb76.append("//").append(substring).append(Mx2MtConstants.NEW_LINE);
}
} else { } else {
sb77A.append("//").append(substring).append(Mx2MtConstants.NEW_LINE); sb77A.append(Mx2MtConstants.NEW_LINE).append("//").append(substring);
} }
} }
} }
if(count<=5){ if(StringUtil.isNotEmpty(uetr)){
if(count==5&&countInt!=0){ if(sb77A.toString().length()>0){
sb77A.append("/UETR/").append(uetr); sb77A.append(Mx2MtConstants.NEW_LINE);
}else { }
sb76.append("/UETR/").append(uetr); String str = "/UETR/" + uetr;
if(str.length()>35){
sb77A.append(str.substring(0, 35)).append(Mx2MtConstants.NEW_LINE).append("//").append(str.substring(35));
} }
}else {
sb77A.append("/UETR/").append(uetr);
} }
} }
} }
......
swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt192292/Mx2Mtn92Creator.java
...@@ -47,10 +47,10 @@ public class Mx2Mtn92Creator extends AbstractMx2MtCreator { ...@@ -47,10 +47,10 @@ public class Mx2Mtn92Creator extends AbstractMx2MtCreator {
@Override @Override
public List<Mx2MtTagsGenerate> getGenerateTagList() { public List<Mx2MtTagsGenerate> getGenerateTagList() {
List<Mx2MtTagsGenerate> fieldsGenerateList = new ArrayList<>(); List<Mx2MtTagsGenerate> fieldsGenerateList = new ArrayList<>();
fieldsGenerateList.add(new Field11SGenerate());
fieldsGenerateList.add(new Field20Generate()); fieldsGenerateList.add(new Field20Generate());
fieldsGenerateList.add(new Field21Generate()); fieldsGenerateList.add(new Field21Generate());
fieldsGenerateList.add(new Field79Generate()); fieldsGenerateList.add(new Field79Generate());
fieldsGenerateList.add(new Field11SGenerate());
return fieldsGenerateList; return fieldsGenerateList;
} }
......
swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt196296/Mx2Mtn96Creator.java
...@@ -47,10 +47,10 @@ public class Mx2Mtn96Creator extends AbstractMx2MtCreator { ...@@ -47,10 +47,10 @@ public class Mx2Mtn96Creator extends AbstractMx2MtCreator {
@Override @Override
public List<Mx2MtTagsGenerate> getGenerateTagList() { public List<Mx2MtTagsGenerate> getGenerateTagList() {
List<Mx2MtTagsGenerate> fieldsGenerateList = new ArrayList<>(); List<Mx2MtTagsGenerate> fieldsGenerateList = new ArrayList<>();
fieldsGenerateList.add(new Field11RGenerate());
fieldsGenerateList.add(new Field20Generate()); fieldsGenerateList.add(new Field20Generate());
fieldsGenerateList.add(new Field21Generate()); fieldsGenerateList.add(new Field21Generate());
fieldsGenerateList.add(new Field76Generate()); fieldsGenerateList.add(new Field76Generate());
fieldsGenerateList.add(new Field11RGenerate());
return fieldsGenerateList; return fieldsGenerateList;
} }
......
swiftCore/src/main/resources/swiftXml/MxCamt02900108_196.xml
...@@ -98,8 +98,6 @@ Change Log ...@@ -98,8 +98,6 @@ Change Log
<OrgnlEndToEndId>pacs008EndToEndId-001</OrgnlEndToEndId> <OrgnlEndToEndId>pacs008EndToEndId-001</OrgnlEndToEndId>
<OrgnlUETR>8a562c67-ca16-48ba-b074-65581be6f001</OrgnlUETR> <OrgnlUETR>8a562c67-ca16-48ba-b074-65581be6f001</OrgnlUETR>
<CxlStsRsnInf> <CxlStsRsnInf>
<AddtlInf>WORLDHELLO,WORLDHELLOWORLDHELLO,WORLDHELLOWORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLD</AddtlInf>
<AddtlInf>NI,HAO</AddtlInf>
<Orgtr> <Orgtr>
<Nm>A Debiter</Nm> <Nm>A Debiter</Nm>
<PstlAdr> <PstlAdr>
......
swiftCore/src/main/resources/swiftXml/MxCamt02900108_296.xml
...@@ -98,8 +98,8 @@ Change Log ...@@ -98,8 +98,8 @@ Change Log
<OrgnlEndToEndId>pacs008EndToEndId-001</OrgnlEndToEndId> <OrgnlEndToEndId>pacs008EndToEndId-001</OrgnlEndToEndId>
<OrgnlUETR>8a562c67-ca16-48ba-b074-65581be6f001</OrgnlUETR> <OrgnlUETR>8a562c67-ca16-48ba-b074-65581be6f001</OrgnlUETR>
<CxlStsRsnInf> <CxlStsRsnInf>
<AddtlInf>ORLDHELLO,WORLDWORLDHORLDHELLO,WORLDWORLDHORLDHELLO,WORLDWORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLD</AddtlInf> <AddtlInf>HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.</AddtlInf>
<AddtlInf>NI,HAO</AddtlInf> <AddtlInf>NICE TO MEET YOU</AddtlInf>
<Orgtr> <Orgtr>
<Nm>A Debiter</Nm> <Nm>A Debiter</Nm>
<PstlAdr> <PstlAdr>
......
swiftCore/src/main/resources/swiftXml/MxCamt05600108_192.xml
...@@ -76,8 +76,6 @@ Change Log ...@@ -76,8 +76,6 @@ Change Log
<OrgnlIntrBkSttlmAmt Ccy="EUR">1500000</OrgnlIntrBkSttlmAmt> <OrgnlIntrBkSttlmAmt Ccy="EUR">1500000</OrgnlIntrBkSttlmAmt>
<OrgnlIntrBkSttlmDt>2021-02-17</OrgnlIntrBkSttlmDt> <OrgnlIntrBkSttlmDt>2021-02-17</OrgnlIntrBkSttlmDt>
<CxlRsnInf> <CxlRsnInf>
<AddtlInf>HELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLD</AddtlInf>
<AddtlInf>NI,HAO</AddtlInf>
<Orgtr> <Orgtr>
<Nm>A Debiter</Nm> <Nm>A Debiter</Nm>
<PstlAdr> <PstlAdr>
......
swiftCore/src/main/resources/swiftXml/MxCamt05600108_292.xml
...@@ -76,8 +76,8 @@ Change Log ...@@ -76,8 +76,8 @@ Change Log
<OrgnlIntrBkSttlmAmt Ccy="EUR">1500000</OrgnlIntrBkSttlmAmt> <OrgnlIntrBkSttlmAmt Ccy="EUR">1500000</OrgnlIntrBkSttlmAmt>
<OrgnlIntrBkSttlmDt>2021-02-17</OrgnlIntrBkSttlmDt> <OrgnlIntrBkSttlmDt>2021-02-17</OrgnlIntrBkSttlmDt>
<CxlRsnInf> <CxlRsnInf>
<AddtlInf>ORLDHELLO,WORLDWORLDHORLDHELLO,WORLDWORLDHORLDHELLO,WORLDWORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLDHELLO,WORLD</AddtlInf> <AddtlInf>HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.</AddtlInf>
<AddtlInf>NI,HAO</AddtlInf> <AddtlInf>NICE TO MEET YOU</AddtlInf>
<Orgtr> <Orgtr>
<Nm>A Debiter</Nm> <Nm>A Debiter</Nm>
<PstlAdr> <PstlAdr>
......
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