修改

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

@@ -130,35 +130,33 @@ public class OTMSController {
     @ApiOperation(value = "新增抵达-APP")
     @PostMapping(value = "/addtmstruckArrivalResultApp")
     public RESTfulResult addtmstruckArrivalResultApp(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, Long arrivalTime,String userName,  MultipartRequest request) throws Exception {
-        //查询旧的抵达
-        Map<String, Object> oldPhoto = otmsFeign.getArrivalPhotoPlus(orderNumber);
-        if(oldPhoto == null){
-            oldPhoto = new HashMap<>();
-        }
+        //查询旧图片
+        Map<String, Object> photoMap = otmsFeign.getArrivalPhotoPlus(orderNumber);
         //上传图片,拼接在一个url里
         Map<String,Object> mapValue=new HashMap<>();
         String url="";
         Boolean isUpload = false;
-        for(int i = 0;i < 5; i++){
-            String oldPhotosArr[] = new String[5];
-            if(oldPhoto.get("photo"+i)!=null && !oldPhoto.get("photo"+i).equals("")){
-                oldPhotosArr = oldPhoto.get("photo"+i).toString().split(";");
-            }
+        //四种图片
+        for(int i = 1;i < 5; i++){
             String photo="";
-            //上传图片，为空则查询旧图片的对应下标图片
+            //默认每种图片最多9张
             for(int j = 0;j < 9; j++){
                 MultipartFile file = request.getFile("photo"+i+"_"+j);
                 if(file!=null){
                     isUpload = true;
                     String  fileName = imageFileUtils.updateFile(file,j)+';';
                     photo += fileName ;
-                    url += fileName;
-                }else if(oldPhotosArr[j] !=null && !oldPhotosArr[j].equals("") && oldPhotosArr[j].length()>5){
-                    String  fileName = oldPhotosArr[j]+';';
-                    photo += fileName;
-                    url += fileName;
                 }
             }
+            if(photo.equals("")){
+                //未上传，用已上传的字段
+                if(photoMap !=null && photoMap.get("photo"+i)!=null && !photoMap.get("photo"+i).equals("")){
+                    photo = photoMap.get("photo"+i).toString();
+                }else{
+                    throw new Exception("必填图片未上传！");
+                }
+            }
+            url += photo;
             mapValue.put("photo"+i,photo);
         }
         //没有上传，当做重复上传