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

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

@@ -595,4 +595,24 @@ public class BMSController extends BaseRESTfulController {
                  endTime);
     }
 
-}
+
+
+    @PostMapping("/getInwardWeightTimeDetailsOrder")
+    public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightTimeDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                endTime);
+    }
+
+}

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

@@ -225,6 +225,17 @@ public class OTMSController {
         return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
     }
 
+    @ApiOperation(value="获取当前订单导航路径")
+    @GetMapping(value = "/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws  Exception {
+       return otmsFeign.getPathByOrderID(orderId,startStep,endStep);
+    }
+
+    @ApiOperation(value="查询所有可选地点")
+    @GetMapping(value = "/mapvertexs/findSelections")
+    public RESTfulResult findSelections(){
+        return otmsFeign.findSelections();
+    }
 
     //在途订单列表
     @PostMapping("/transportationPerformance")

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

@@ -245,4 +245,20 @@ public interface BmstruckFeign {
                                                     @RequestParam("userId") String userId,
                                                     @RequestParam("startTime")String startTime,
                                                     @RequestParam("endTime")String endTime);
-}
+
+
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightTimeDetailsOrder")
+    Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("carrierSsoId") String carrierSsoId,
+                                                        @RequestParam("detailStatus") Integer detailStatus,
+                                                        @RequestParam("orderType") Integer orderType,
+                                                        @RequestParam("userId") String userId,
+                                                        @RequestParam("startTime")String startTime,
+                                                        @RequestParam("endTime")String endTime);
+}
+
+

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

@@ -123,6 +123,14 @@ public interface OtmsFeign {
     @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
     public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
 
+    //获取当前订单导航路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws Exception;
+
+    //获取导航可选地点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
+    public RESTfulResult findSelections();
+
     @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;