wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 7d1fb60ac48c907d6bb04c457700cb2b5aa8ec8e 1 个父辈 e86fb799

添加 批量单号发送删除 逻辑修改 

添加出港预配  批量生成删除 批量生成发送 批量生成修改
内嵌 并排对比
正在显示 4 个修改的文件 包含 100 行增加 和 24 行删除
... ... @@ -34,6 +34,26 @@ public class MT1201Controller {
}
}
/**
* 原始 FFm
* @param map
* @return
*/
@RequestMapping("/batchCreateMt1201")
@ResponseBody
public Map<String, Object> batchCreateMt1201(@RequestBody Map<String, Object> map){
try {
return mt1201Service.ffmcreate(map);
}catch (Exception e){
e.printStackTrace();
Map<String, Object> maps = new HashMap<>();
maps.put("status", "0");
return maps;
}
}
/**
* 原始 FFm
... ... @@ -70,6 +90,20 @@ public class MT1201Controller {
}
}
@PutMapping("/batchRemoveMt1201")
@ResponseBody
public Map<String, Object> batchRemoveMt1201(@RequestBody Map<String, Object> map){
try {
return mt1201Service.removeMt1201(map);
}catch (Exception e){
e.printStackTrace();
Map<String, Object> maps = new HashMap<>();
maps.put("status", "0");
return maps;
}
}
}
... ...
... ... @@ -2,12 +2,14 @@ package com.sunyo.wlpt.message.builder.controller;
import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT2201;
import com.sunyo.wlpt.message.builder.service.MT2201Service;
import com.sunyo.wlpt.message.builder.util.ReturnUtil;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
... ... @@ -48,7 +50,6 @@ public class MT2201Controller {
@RequestParam("contactTel")String contactTel) {
try {
return mt2201Service.editMt2201(nmmsCustomMt2201List, reason, contactName, contactTel);
}catch (Exception e){
e.printStackTrace();
... ... @@ -60,15 +61,21 @@ public class MT2201Controller {
@PutMapping("/removeMt2201")
@ApiOperation(value = "删除报文")
@ResponseBody
public Map<String, Object> removeMt2201(@RequestBody Map<String, Object> map) {
public List<Map<String, Object>> removeMt2201(@RequestBody List<NMMS_CUSTOM_MT2201> nmmsCustomMt2201List,
@RequestParam("reason")String reason,
@RequestParam("contactName")String contactName,
@RequestParam("contactTel")String contactTel,
@RequestParam("content")String content) {
try {
return mt2201Service.removeMt2201(map);
Map<String, Object> map = removeLogic(nmmsCustomMt2201List, reason, contactName, contactTel, content);
Map<String, Object> mapNmms = mt2201Service.removeMt2201(map);
List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(mapNmms);
return mapList;
}catch (Exception e){
e.printStackTrace();
Map<String, Object> maps = new HashMap<>();
maps.put("status", "0");
return maps;
return null;
}
}
... ... @@ -85,4 +92,36 @@ public class MT2201Controller {
}
/**
* 删除报文逻辑处理
*/
public Map<String, Object> removeLogic(List<NMMS_CUSTOM_MT2201> nmmsCustomMt2201List,
String reason,
String contactName,
String contactTel,
String content){
Map<String, Object> map = new HashMap<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
for (NMMS_CUSTOM_MT2201 nmmsCustomMt2201 : nmmsCustomMt2201List){
map.put("flightDates",sdf.format(nmmsCustomMt2201.getFlightdate()));
map.put("carrier", nmmsCustomMt2201.getCarrier());
map.put("flightNo", nmmsCustomMt2201.getFlightno());
map.put("customCode", nmmsCustomMt2201.getCustomcode());
map.put("awba", nmmsCustomMt2201.getAwba());
break;
}
for (NMMS_CUSTOM_MT2201 nmmsCustomMt2201 : nmmsCustomMt2201List){
// 处理主单号-
String awba = ReturnUtil.awbaReplace(nmmsCustomMt2201.getAwba());
nmmsCustomMt2201.setAwba(awba);
}
map.put("reason",reason);
map.put("contactName",contactName);
map.put("contactTel",contactTel);
map.put("content",content);
map.put("nmmsCustomMt2201List", nmmsCustomMt2201List);
return map;
}
}
... ...
... ... @@ -104,17 +104,16 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
map.put("map", mt2201);
// 舱单传输人名称
map.put("orgCode", orgCode);
// 处理主单号-
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
map.put("flightDates",flightDate);
// // 处理主单号-
// String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
// map.put("awbas", awba);
// String flightDate = ReturnUtil.awbaReplace(map.get("flightDate").toString());
// map.put("flightDates",flightDate);
Map<String, Object> hashMap = new HashMap<>();
// 生成报文
if (makeXmlToFile("/remove/MT2201.ftlx", mt2201.get("messageID").toString()+".xml", map, "./send/remove/")>0){
map.put("functionCode", "3");
map.put("busType","MT2201");
System.out.println();
NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
// 操作类型
nmmsCustomResponse.setOpertype("删除");
... ...
... ... @@ -16,21 +16,25 @@
<BorderTransportMeans>
<JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awbas}</ID>
<ChangeReasonCode>9999</ChangeReasonCode>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
<#list nmmsCustomMt2201List as nmms>
<Consignment>
<TransportContractDocument>
<ID>${nmms.awba}</ID>
<ChangeReasonCode>9999</ChangeReasonCode>
</TransportContractDocument>
<#if nmms.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${nmms.awba}_${nmms.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
</#list>
<AdditionalInformation>
<Reason>${reason}</Reason>
<ContactName>${contactName}</ContactName>
<ContactTel>${contactTel}</ContactTel>
<Content>${content}</Content>
</AdditionalInformation>
</Declaration>
</Manifest>
\ No newline at end of file
</Manifest>
... ...