图片上传修改

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.awt.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,18 +83,33 @@ public class OTMSController {
 
     @PostMapping(value = "/addTmstruckReceiptResult")
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+        //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
+        //第一张和第二张必填
         files.add(request.getFile("file0"));
         files.add(request.getFile("file1"));
+        //第三张选填
         if (request.getFile("file2")!=null){
             files.add(request.getFile("file2"));
         }
+        //追加的三张，num=6则取到file3,4,5
+        for(int i=3;i<num;i++){
+            if(request.getFile("file"+i)!=null){
+                files.add(request.getFile("file"+i));
+            }
+        }
+        //上传图片,追加的三张图片放在fourFiles里
+        List<String> fourFiles=new ArrayList<>();
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
             String url = imageFileUtils.updateFile(file);
             mapValue.put("url"+i,url);
+            if(i>=3) {
+                fourFiles.add(url);
+            }
         }
+        mapValue.put("fourFiles",fourFiles);
         return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 

src/main/resources/application-dev.yml

@@ -36,12 +36,12 @@ openfeign:
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.33.162:8038}
+    url: ${OTMSFEIGN_URL:localhost:8038}
 piction:
   #path: /usr/share/nginx/html/image
   #path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
-  path: /shared
+  path: D:\Code\work\jpg
+  #path: /shared
 
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
-  path: /shared
+  path: C:\Users\24390\Desktop\work\a
+  #path: /shared
 server:
   port: 8080

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8