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

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

@@ -3,6 +3,7 @@ import com.steerinfo.dil.feign.RmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -211,6 +212,10 @@ public class RMScontroller {
     public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
         return rmsFeign.uploadCarrier1(multipartFile);
     }
+
+
+
+
     //    处理承运商照片
     @PostMapping("/uploadCarrier2")
     public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
@@ -1169,4 +1174,17 @@ public class RMScontroller {
     public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
         return rmsFeign.signConsignee(mapVal);
     }
+
+    //边输边查港口名称
+    @PostMapping(value = "/getPortName")
+    public Map<String, Object> getPortName(String index){
+        return rmsFeign.getPortName(index);
+    }
+
+    //边输边查码头名称
+    @PostMapping(value = "/getPierName")
+    public Map<String, Object> getPierName(String index){
+        return rmsFeign.getPierName(index);
+    }
+
 }

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

@@ -1939,8 +1939,8 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list) {
-        return tmsTrainFeign.addDomesticLoadResult(list);
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.addDomesticLoadResult(mapValue);
     }
 
     @ApiOperation(value = "国产矿物流补录装车信息")

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

@@ -640,4 +640,12 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmsconsignee/signConsignee")
     Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
+
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPortName")
+    Map<String, Object> getPortName(@RequestParam("index") String index);
+
+    // 边输边查码头名称
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
+    Map<String, Object> getPierName(@RequestParam("index") String index);
 }

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

@@ -237,7 +237,7 @@ public interface TmsTrainFeign {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list);
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")

src/main/resources/bootstrap.yml

@@ -18,12 +18,12 @@ eureka:
     service-url:
 
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
-    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}