修改抵达

src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -80,39 +80,41 @@ public class OTMSController {
     public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartRequest request) throws Exception {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
-        String file="";
-        int index=0;
-        //第一张和第二张必填
-        for(int i=1;i<=2;i++){
-            MultipartFile temp = request.getFile("file"+i);
-            if(temp!=null){
-                files.add(temp);
-                index=i;//记录是新上传了第一张还是第二张图片
+        int index=-1;
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+                if(index<0){
+                    index=i;
+                }
             }
         }
         //没有上传，当做重复上传
         if(files.size() == 0){
-            return  new RESTfulResult("201","若要重复上传，必须两张都是新图片！","请勿重复上传！");
-        }
-        //上传图片
-        for(int i=0;i<files.size();i++){
-            file+=imageFileUtils.updateFile(files.get(i),i)+';';
+            return  new RESTfulResult("201","请勿重复上传！","请勿重复上传！");
         }
-        //只上传了一张图片，补足另一张
-        if(files.size() == 1){
-            try{
-                String arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber);
-                String[] olds=arrivalPhoto.split(";");
-                if(index==1){
-                    file=file+olds[1]+";";
-                }else if(index==2){
-                    file=olds[0]+";"+file;
+        //上传图片,拼接在一个url里
+        Map<String,Object> mapValue=new HashMap<>();
+        String url="";
+        try{
+            //如果存在预览图片，查询，把那个位置的图片截取下来
+            if(index > 0){
+                String[] arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber).split(";");
+                for(int i=0;i<index;i++){
+                    url=url+arrivalPhoto[i]+";";
                 }
-            }catch (Exception e){
-
             }
+        }catch (Exception e){
+
         }
-        return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
+        //上传图片
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
+        }
+        mapValue.put("url",url);
+        return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,url);
     }
 
     @ApiOperation(value = "新增签收")
@@ -128,8 +130,8 @@ public class OTMSController {
                 break;
             }
         }
-        if(files.size()<3){
-            return  new RESTfulResult("201","至少上传三张图片！","至少上传三张图片！");
+        if(files.size()<2){
+            return  new RESTfulResult("201","至少上传两张图片！","至少上传两张图片！");
         }
         //上传图片,拼接在一个url里
         Map<String,Object> mapValue=new HashMap<>();