Merge remote-tracking branch 'origin/master'

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

@@ -415,11 +415,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
+                                                             String con,
                                                              Integer deleted) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
     }
 
     @PostMapping("/getInwardContractPrice")

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

@@ -250,4 +250,9 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
+
+    @GetMapping("/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
+        return otmsFeign.getLocationForAddress(address);
+    }
 }

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

@@ -336,6 +336,7 @@ public interface AmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
                                        @RequestParam("deleted") Integer deleted
 
     );

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

@@ -139,4 +139,8 @@ public interface OtmsFeign {
 
     @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    //查询地址经纬度
+    @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
 }