修改数据类型

@@ -5,6 +5,7 @@ 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 io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,14 +33,20 @@ public class NmmsImportController {
      * @param originmanifestsecondary
      * @return
      */
-    @RequestMapping(value = "/imp_removes")
+    @ApiOperation(value = "批量删除")
+    @PostMapping(value = "/imp_removes")
     @ResponseBody
     public ResultJson antivirus_log_remove(@RequestBody Originmanifestsecondary originmanifestsecondary){
         int r = 0;
-        List<String> awbhIds = originmanifestsecondary.getAwbhIds();
-        for (int i=0; i< awbhIds.size(); i++){
-            r += originService.deleteAwbh(awbhIds.get(i));
+        if(originmanifestsecondary != null){
+            if (originmanifestsecondary.getAwbhIds().contains(",")){
+                String[] split = originmanifestsecondary.getAwbhIds().split(",");
+                for (int i=0; i< split.length; i++){
+                    r += originService.deleteAwbh(split[i]);
                 }
+            }
+        }
+
 
         return r > 0 ? new ResultJson("200", "批量删除成功")
                 : new ResultJson("201", "批量删除失败");
@@ -52,7 +59,8 @@ public class NmmsImportController {
      * @param originmanifestmaster
      * @return
      */
-    @RequestMapping(value = "/mountAwbh")
+    @ApiOperation(value = "分单批量挂载")
+    @PostMapping(value = "/mountAwbh")
     @ResponseBody
     public ResultJson antivirus_log_remove(@RequestBody ORIGINMANIFESTMASTER originmanifestmaster){
 

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

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

@@ -32,10 +32,12 @@ public class NmmsImportServiceImpl implements NmmsImportService{
         int w = 0;
         try {
             String awba = "";
-            List<String> awbhIds = master.getAwbhIds();
+            if(master != null){
+                if (master.getAwbhIds().contains(",")){
+                    String[] split = master.getAwbhIds().split(",");
                     // 查询该分单绑定的主单id
-            for (int i=0; i< awbhIds.size(); i++){
-                Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(awbhIds.get(i));
+                    for (int i=0; i< split.length; i++){
+                        Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(split[i]);
                         log.info("查询的主单id:{}", originmanifestsecondary);
                         if (originmanifestsecondary != null){
                             awba = originmanifestsecondary.getWaybillnomaster();
@@ -44,12 +46,14 @@ public class NmmsImportServiceImpl implements NmmsImportService{
                             // 修改分单表 所绑定的主单id
                             if (originmanifestmaster!=null){
                                 log.info("挂载主单的id:{}", originmanifestmaster);
-                        log.info("修改分单数据参数:{}", awbhIds, originmanifestmaster.getAutoid());
-                        w = originmanifestsecondaryMapper.updateMasterAutoId(awbhIds.get(i), originmanifestmaster.getAutoid());
+                                log.info("修改分单数据参数:{}", split, originmanifestmaster.getAutoid());
+                                w = originmanifestsecondaryMapper.updateMasterAutoId(split[i], originmanifestmaster.getAutoid());
                                 log.info("修改后的状态:{}", w);
                             }
                         }
                     }
+                }
+            }
             return w;
         }catch (Exception e){
             e.printStackTrace();