Bläddra i källkod

修改签收多张图片的处理

liyg 3 år sedan
förälder
incheckning
ac98f89dc5

+ 13 - 0
src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -193,6 +193,19 @@ public class OTMSController {
             String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultReceiveNotePhoto").toString());
             map.put("resultReceiveNotePhoto",resultSignedNotePhoto);
         }
+        //追加的图片
+        if(map.containsKey("otherPhoto1") && map.get("otherPhoto1")!=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto1").toString());
+            map.put("otherPhoto1",resultSignedNotePhoto);
+        }
+        if(map.containsKey("otherPhoto2") && map.get("otherPhoto2") !=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto2").toString());
+            map.put("otherPhoto2",resultSignedNotePhoto);
+        }
+        if(map.containsKey("otherPhoto3") && map.get("otherPhoto3") !=null){
+            String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto3").toString());
+            map.put("otherPhoto3",resultSignedNotePhoto);
+        }
         return map;
     }
 

+ 2 - 0
src/main/resources/application-dev.yml

@@ -23,6 +23,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    #url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -37,6 +38,7 @@ openfeign:
     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

+ 1 - 0
src/main/resources/bootstrap.yml

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