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

添加出港预配  批量生成删除 批量生成发送 批量生成修改

@@ -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
      * 原始 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.base.model.NMMS_CUSTOM_MT2201;
 import com.sunyo.wlpt.message.builder.service.MT2201Service;
 import com.sunyo.wlpt.message.builder.service.MT2201Service;
+import com.sunyo.wlpt.message.builder.util.ReturnUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -48,7 +50,6 @@ public class MT2201Controller {
                                                 @RequestParam("contactTel")String contactTel) {
                                                 @RequestParam("contactTel")String contactTel) {
 
 
         try {
         try {
-
             return mt2201Service.editMt2201(nmmsCustomMt2201List, reason, contactName, contactTel);
             return mt2201Service.editMt2201(nmmsCustomMt2201List, reason, contactName, contactTel);
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
@@ -60,15 +61,21 @@ public class MT2201Controller {
     @PutMapping("/removeMt2201")
     @PutMapping("/removeMt2201")
     @ApiOperation(value = "删除报文")
     @ApiOperation(value = "删除报文")
     @ResponseBody
     @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 {
         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){
         }catch (Exception e){
             e.printStackTrace();
             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("map", mt2201);
         // 舱单传输人名称
         // 舱单传输人名称
         map.put("orgCode", orgCode);
         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<>();
         Map<String, Object> hashMap = new HashMap<>();
         // 生成报文
         // 生成报文
         if (makeXmlToFile("/remove/MT2201.ftlx", mt2201.get("messageID").toString()+".xml", map, "./send/remove/")>0){
         if (makeXmlToFile("/remove/MT2201.ftlx", mt2201.get("messageID").toString()+".xml", map, "./send/remove/")>0){
             map.put("functionCode", "3");
             map.put("functionCode", "3");
             map.put("busType","MT2201");
             map.put("busType","MT2201");
-            System.out.println();
             NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
             NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
             // 操作类型
             // 操作类型
             nmmsCustomResponse.setOpertype("删除");
             nmmsCustomResponse.setOpertype("删除");

@@ -16,21 +16,25 @@
         <BorderTransportMeans>
         <BorderTransportMeans>
             <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
             <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
         </BorderTransportMeans>
         </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>
         <AdditionalInformation>
             <Reason>${reason}</Reason>
             <Reason>${reason}</Reason>
             <ContactName>${contactName}</ContactName>
             <ContactName>${contactName}</ContactName>
             <ContactTel>${contactTel}</ContactTel>
             <ContactTel>${contactTel}</ContactTel>
+            <Content>${content}</Content>
         </AdditionalInformation>
         </AdditionalInformation>
     </Declaration>
     </Declaration>
-</Manifest>
+</Manifest>