分单批量删除 分单批量挂载 接收参数 完善

主分单实体添加 分单集合变量

 package com.tianbo.analysis.controller;
 
+import com.tianbo.analysis.model.ORIGINMANIFESTMASTER;
+import com.tianbo.analysis.model.Originmanifestsecondary;
 import com.tianbo.analysis.model.ResultJson;
 import com.tianbo.analysis.service.NmmsImportService;
 import com.tianbo.analysis.service.OriginService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
+import static sun.plugin2.os.windows.OSVERSIONINFOA.size;
+
 /**
  * @author shenhl
  * <p>
@@ -23,16 +29,18 @@ public class NmmsImportController {
     NmmsImportService nmmsImportService;
 
     /**
+     * awbhIds[] 分单id
      * 批量删除
-     * @param awbhIds
+     * @param originmanifestsecondary
      * @return
      */
     @RequestMapping(value = "/imp_removes")
     @ResponseBody
-    public ResultJson antivirus_log_remove(String[] awbhIds){
+    public ResultJson antivirus_log_remove(@RequestBody Originmanifestsecondary originmanifestsecondary){
         int r = 0;
-        for (int i=0; i< awbhIds.length; i++){
-            r += originService.deleteAwbh(awbhIds[i]);
+        List<String> awbhIds = originmanifestsecondary.getAwbhIds();
+        for (int i=0; i< awbhIds.size(); i++){
+            r += originService.deleteAwbh(awbhIds.get(i));
         }
 
         return r > 0 ? new ResultJson("200", "批量删除成功")
@@ -40,19 +48,17 @@ public class NmmsImportController {
     }
 
     /**
-     *
-     * @param awbhIds
-     * @param flightNo
-     * @param flightDate
+     * awbhIds[] 分单id
+     * flightDate 航班日期
+     * flightno 航班号
+     * @param originmanifestmaster
      * @return
      */
     @RequestMapping(value = "/mountAwbh")
     @ResponseBody
-    public ResultJson antivirus_log_remove(@RequestParam(value ="awbhIds")String[] awbhIds,
-                                           @RequestParam(value ="flightNo") String flightNo,
-                                           @RequestParam(value ="flightDate") String flightDate){
+    public ResultJson antivirus_log_remove(@RequestBody ORIGINMANIFESTMASTER originmanifestmaster){
 
-        return nmmsImportService.mountAwbh(awbhIds,flightNo,flightDate) > 0 ? new ResultJson("200", "分单挂载成功")
+        return nmmsImportService.mountAwbh(originmanifestmaster) > 0 ? new ResultJson("200", "分单挂载成功")
                 : new ResultJson("201", "分单挂载失败");
     }
 }

@@ -3,6 +3,7 @@ package com.tianbo.analysis.dao;
 import com.tianbo.analysis.model.ORIGINMANIFESTMASTER;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +26,7 @@ public interface ORIGINMANIFESTMASTERMapper {
 
     ORIGINMANIFESTMASTER findAwba(@Param("waybillnomaster") String var1,
                                       @Param("flightNo")String var2,
-                                      @Param("flightDate")String var3
+                                      @Param("flightDate") Date var3
     );
 
     List<ORIGINMANIFESTMASTER> searchSec(String autoid);

@@ -92,8 +92,18 @@ public class ORIGINMANIFESTMASTER extends ManifestBase{
 
     private String consigneePhone;
 
+    public List<String> awbhIds;
+
     public List<ORIGINMANIFESTMASTER> chidren;
 
+    public List<String> getAwbhIds() {
+        return awbhIds;
+    }
+
+    public void setAwbhIds(List<String> awbhIds) {
+        this.awbhIds = awbhIds;
+    }
+
     public String getAutoid() {
         return autoid;
     }

@@ -95,6 +95,16 @@ public class Originmanifestsecondary {
     //报文结束标识
     private static String END_WORD= "=";
 
+    private List<String> awbhIds;
+
+    public List<String> getAwbhIds() {
+        return awbhIds;
+    }
+
+    public void setAwbhIds(List<String> awbhIds) {
+        this.awbhIds = awbhIds;
+    }
+
     public String getAutoid() {
         return autoid;
     }

 package com.tianbo.analysis.service;
 
+import com.tianbo.analysis.model.ORIGINMANIFESTMASTER;
 import com.tianbo.analysis.model.ResultJson;
 
+import java.util.List;
+
 /**
  * @author shenhl
  * <p>
@@ -9,8 +12,6 @@ import com.tianbo.analysis.model.ResultJson;
  */
 public interface NmmsImportService {
 
-    int mountAwbh(String[] awbhIds,
-                         String flightNo,
-                         String flightDate);
+    int mountAwbh(ORIGINMANIFESTMASTER originmanifestmaster);
 
 }

@@ -9,6 +9,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author shenhl
  * <p>
@@ -25,24 +27,29 @@ public class NmmsImportServiceImpl implements NmmsImportService{
     ORIGINMANIFESTMASTERMapper originmanifestmasterMapper;
 
     @Override
-    public int mountAwbh(String[] awbhIds, String flightNo, String flightDate) {
+    public int mountAwbh(ORIGINMANIFESTMASTER master) {
 
         int w = 0;
         try {
             String awba = "";
+            List<String> awbhIds = master.getAwbhIds();
             // 查询该分单绑定的主单id
-            for (int i=0; i< awbhIds.length; i++){
-                Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(awbhIds[i]);
+            for (int i=0; i< awbhIds.size(); i++){
+                Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(awbhIds.get(i));
                 log.info("查询的主单id:{}", originmanifestsecondary);
+                if (originmanifestsecondary != null){
                     awba = originmanifestsecondary.getWaybillnomaster();
                     // 查询需要挂载的主单id
-                ORIGINMANIFESTMASTER originmanifestmaster = originmanifestmasterMapper.findAwba(awba, flightNo, flightDate);
+                    ORIGINMANIFESTMASTER originmanifestmaster = originmanifestmasterMapper.findAwba(awba, master.getFlightno(), master.getFlightDate());
+                    // 修改分单表 所绑定的主单id
+                    if (originmanifestmaster!=null){
                         log.info("挂载主单的id:{}", originmanifestmaster);
                         log.info("修改分单数据参数:{}", awbhIds, originmanifestmaster.getAutoid());
-                // 修改分单表 所绑定的主单id
-                w = originmanifestsecondaryMapper.updateMasterAutoId(awbhIds[i], originmanifestmaster.getAutoid());
+                        w = originmanifestsecondaryMapper.updateMasterAutoId(awbhIds.get(i), originmanifestmaster.getAutoid());
                         log.info("修改后的状态:{}", w);
                     }
+                }
+            }
             return w;
         }catch (Exception e){
             e.printStackTrace();