wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 67d68bdc7b3fcd64cd820535b63d7d13da48dd0c 1 个父辈 3a8d0059

生成报文删除报 航班日期格式 修改

内嵌 并排对比
正在显示 16 个修改的文件 包含 32 行增加 和 9 行删除
@@ -63,6 +63,9 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{ @@ -63,6 +63,9 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
63 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 63 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
64 map.put("awbas", awba); 64 map.put("awbas", awba);
65 65
  66 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  67 + map.put("flightDates",flightDate);
  68 +
66 // 生成报文 69 // 生成报文
67 Map<String, Object> hashMap = new HashMap<>(); 70 Map<String, Object> hashMap = new HashMap<>();
68 // 生成报文 71 // 生成报文
@@ -92,6 +92,10 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service { @@ -92,6 +92,10 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
92 // 处理主单号- 92 // 处理主单号-
93 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 93 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
94 map.put("awbas", awba); 94 map.put("awbas", awba);
  95 +
  96 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  97 + map.put("flightDates",flightDate);
  98 +
95 Map<String, Object> hashMap = new HashMap<>(); 99 Map<String, Object> hashMap = new HashMap<>();
96 // 生成报文 100 // 生成报文
97 if (makeXmlToFile("/remove/MT2201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 101 if (makeXmlToFile("/remove/MT2201.ftlx", msgId+".xml", map, "./send/remove/")>0){
@@ -104,6 +104,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service { @@ -104,6 +104,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
104 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 104 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
105 map.put("awbas", awba); 105 map.put("awbas", awba);
106 106
  107 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  108 + map.put("flightDates",flightDate);
  109 +
107 Map<String, Object> map3201 = new HashMap<>(); 110 Map<String, Object> map3201 = new HashMap<>();
108 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){ 111 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){
109 map.put("functionCode", "3"); 112 map.put("functionCode", "3");
@@ -99,6 +99,9 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service { @@ -99,6 +99,9 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
99 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 99 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
100 map.put("awbas", awba); 100 map.put("awbas", awba);
101 101
  102 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  103 + map.put("flightDates",flightDate);
  104 +
102 Map<String, Object> map3201 = new HashMap<>(); 105 Map<String, Object> map3201 = new HashMap<>();
103 if (makeXmlToFile("/remove/MT3202.ftlx", msgId+".xml", map,"./send/remove/")>0){ 106 if (makeXmlToFile("/remove/MT3202.ftlx", msgId+".xml", map,"./send/remove/")>0){
104 map.put("functionCode", "3"); 107 map.put("functionCode", "3");
@@ -104,6 +104,10 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service { @@ -104,6 +104,10 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
104 // 处理主单号 - 104 // 处理主单号 -
105 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 105 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
106 map.put("awbas", awba); 106 map.put("awbas", awba);
  107 +
  108 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  109 + map.put("flightDates",flightDate);
  110 +
107 Map<String, Object> map4201 = new HashMap<>(); 111 Map<String, Object> map4201 = new HashMap<>();
108 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 112 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){
109 map.put("functionCode", "3"); 113 map.put("functionCode", "3");
@@ -153,6 +153,9 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -153,6 +153,9 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
153 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 153 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
154 map.put("awbas", awba); 154 map.put("awbas", awba);
155 155
  156 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  157 + map.put("flightDates",flightDate);
  158 +
156 if ("MT5201".equals(map.get("rcfdep").toString())){ 159 if ("MT5201".equals(map.get("rcfdep").toString())){
157 // 生成报文头部 160 // 生成报文头部
158 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString()); 161 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString());
@@ -98,6 +98,9 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{ @@ -98,6 +98,9 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
98 String awba = ReturnUtil.awbaReplace(map.get("awba").toString()); 98 String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
99 map.put("awbas", awba); 99 map.put("awbas", awba);
100 100
  101 + String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
  102 + map.put("flightDates",flightDate);
  103 +
101 Map<String, Object> map3201 = new HashMap<>(); 104 Map<String, Object> map3201 = new HashMap<>();
102 if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){ 105 if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){
103 map.put("functionCode", "3"); 106 map.put("functionCode", "3");
@@ -96,7 +96,7 @@ public class ReturnUtil { @@ -96,7 +96,7 @@ public class ReturnUtil {
96 */ 96 */
97 public static String awbaReplace(String awba){ 97 public static String awbaReplace(String awba){
98 98
99 - return awba.replace("-",""); 99 + return awba.replaceAll("-","");
100 } 100 }
101 101
102 } 102 }
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <Name>${orgCode}</Name> 13 <Name>${orgCode}</Name>
14 </RepresentativePerson> 14 </RepresentativePerson>
15 <BorderTransportMeans> 15 <BorderTransportMeans>
16 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 16 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
17 </BorderTransportMeans> 17 </BorderTransportMeans>
18 <Consignment> 18 <Consignment>
19 <TransportContractDocument> 19 <TransportContractDocument>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <Name>${orgCode}</Name> 14 <Name>${orgCode}</Name>
15 </RepresentativePerson> 15 </RepresentativePerson>
16 <BorderTransportMeans> 16 <BorderTransportMeans>
17 - <JourneyID>${carrier}${flightNo}/${flightDate}</JourneyID> 17 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
18 </BorderTransportMeans> 18 </BorderTransportMeans>
19 <Consignment> 19 <Consignment>
20 <TransportContractDocument> 20 <TransportContractDocument>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <Declaration> 11 <Declaration>
12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 14 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <BorderTransportMeans> 12 <BorderTransportMeans>
13 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 13 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <BorderTransportMeans> 12 <BorderTransportMeans>
13 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 13 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <Declaration> 11 <Declaration>
12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 14 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <Declaration> 11 <Declaration>
12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${carrier}${flightNo}/${flightDate}</JourneyID> 14 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <BorderTransportMeans> 12 <BorderTransportMeans>
13 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 13 + <JourneyID>${flightNo}/${flightDates}</JourneyID>
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>