Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -282,6 +283,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
     }
 
+
+    @PostMapping(value = "/uploadCargoPic")
+    public String uploadCargoPic(@RequestParam ("file") MultipartFile multipartFile){
+        return tmsshipFeign.uploadCargoPic(multipartFile);
+    }
+
     /**
      * 卸船作业
      * @param mapValue

src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -3,7 +3,9 @@ package com.steerinfo.dil.feign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -789,4 +791,7 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -40,7 +40,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8003}
   WMSHFeign:
@@ -48,7 +48,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.104:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign: