提取TMS中的OMS和AMS

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,103 @@ public class AMScontroller extends BaseRESTfulController {
     @Autowired
     AmsFeign amsFeign;
 
+    @ApiOperation(value="查询运输预约")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(79)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllPurPlan")
+    public RESTfulResult getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status);
+    }
+
+    /*
+    不知道谁写的
+     */
+    @PostMapping("/getAllPurPlan/{apiId}")
+    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+                                            @RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getDetailListByCon(apiId, mapValue, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getPurPlanById/{planId}")
+    public RESTfulResult getPurPlanById(@PathVariable("planId") Integer planId) {
+        return amsFeign.getPurPlanById(planId);
+    }
+
+    @ApiOperation(value = "新增运输计划 状态：0")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
+    })
+    @PostMapping("/addPurPlan")
+    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map) {
+        return amsFeign.addPurPlan(map);
+    }
+
+    @ApiOperation(value = "下发运输计划 状态：1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendPurPlan/{planId}")
+    public RESTfulResult sendPurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.sendPurPlan(planId);
+    }
+
+    @ApiOperation(value = "接收运输计划 状态：2")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/receptionPurPlan/{planId}")
+    public RESTfulResult receptionPurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.receptionPurPlan(planId);
+    }
+
+    @ApiOperation(value = "逻辑删除运输计划 状态：3")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deletePurPlan/{planId}")
+    public RESTfulResult deletePurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.deletePurPlan(planId);
+    }
+
+    //**************************************************************************************
+    @ApiOperation(value = "查询要分派的计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(82)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDecomposedPlan")
+    public RESTfulResult getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer planId,
+                                           Integer status) {
+        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status);
+    }
+
+
     /**
      * 违约规则
      *

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

@@ -1,8 +1,203 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author luobang
  * @create 2021-09-17 14:10
  */
+@RestController
+@RequestMapping("${api.version}/oms")
 public class OMSController {
+
+
+    @Autowired
+    OmsFeign omsFeign;
+    
+    //********************************************omsTruckOrderController*****************************
+
+    @ApiOperation(value = "查询所有运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(86)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTruckOrder")
+    public RESTfulResult getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer orderStatus,
+                                          Integer planId,
+                                          Integer orderType) {
+        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
+    }
+
+    @ApiOperation(value = "不适用表头返回数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/getAllTruckOrderReturnListMap")
+    public RESTfulResult getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
+        return omsFeign.getAllTruckOrder(orderStatus, planId, orderType);
+    }
+
+    @ApiOperation(value = "查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacity")
+    public RESTfulResult getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer carrierId
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+    @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addPurOrder")
+    public RESTfulResult addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.addPurOrder(mapValue);
+    }
+    // == null ? new HashMap<>() : mapValue
+
+
+    @ApiOperation(value = "修改分派计划")
+    @PostMapping("/updateOrder")
+    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map) {
+        return omsFeign.updateOrder(map);
+    }
+
+
+    @ApiOperation(value = "派单")
+    @PostMapping("/dispatchOrder/{orderId}")
+    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId) {
+        return omsFeign.dispatchOrder(orderId);
+    }
+
+    @ApiOperation(value = "逻辑删除运单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deleteOrder")
+    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     Integer planId) {
+        return omsFeign.deleteOrder(map, planId);
+    }
+
+    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/driverReceiveOrRefuse/{orderId}")
+    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
+        return omsFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
+    }
+
+
+    @ApiOperation(value="司机接单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               @PathVariable Integer orderReceiveStatus,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ){
+        return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
+                pageSize, orderReceiveStatus, orderType, orderStatus);
+    }
+
+
+    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/sendMesToDriver")
+    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
+        return omsFeign.sendMesToDriver(capacityNumber, orderStatus);
+    }
+
+    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getRefuseOrderByCapacityNum")
+    public RESTfulResult sendMesToDriver(String capacityNumber){
+        return omsFeign.sendMesToDriver(capacityNumber);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getOrderMesByOrderNum/{orderId}")
+    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
+        return omsFeign.getOrderMesByOrderNum(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectPlaceAndTime/{orderId}")
+    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
+        return omsFeign.selectPlaceAndTime(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息")
+    @PostMapping("/selectOrderByOrderId/{orderId}")
+    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
+        return omsFeign.selectOrderByOrderId(orderId);
+    }
+
+    @ApiOperation(value="查看运输派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              @PathVariable Integer orderReceiveStatus,
+                                              Integer orderType,
+                                              Integer orderStatus){
+        return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                orderReceiveStatus, orderType, orderStatus);
+    }
+
+
 }

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

@@ -1002,278 +1002,6 @@ public class TMSController extends BaseRESTfulController {
 
         /*======================================汽运==========================================*/
 
-    @ApiOperation(value="查询运输预约")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(79)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllPurPlan")
-    public RESTfulResult getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer status) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsTruckFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status);
-    }
-
-    /*
-    不知道谁写的
-     */
-    @PostMapping("/getAllPurPlan/{apiId}")
-    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsTruckFeign.getDetailListByCon(apiId, mapValue, pageNum, pageSize, con);
-    }
-
-    @ApiOperation(value = "通过Id查询请车作业")
-    @PostMapping("/getPurPlanById/{planId}")
-    public RESTfulResult getPurPlanById(@PathVariable("planId") Integer planId) {
-        return tmsTruckFeign.getPurPlanById(planId);
-    }
-
-    @ApiOperation(value = "新增运输计划 状态：0")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map) {
-        return tmsTruckFeign.addPurPlan(map);
-    }
-
-    @ApiOperation(value = "下发运输计划 状态：1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/sendPurPlan/{planId}")
-    public RESTfulResult sendPurPlan(@PathVariable("planId") Integer planId) {
-        return tmsTruckFeign.sendPurPlan(planId);
-    }
-
-    @ApiOperation(value = "接收运输计划 状态：2")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId") Integer planId) {
-        return tmsTruckFeign.receptionPurPlan(planId);
-    }
-
-    @ApiOperation(value = "逻辑删除运输计划 状态：3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId") Integer planId) {
-        return tmsTruckFeign.deletePurPlan(planId);
-    }
-
-    //**************************************************************************************
-    @ApiOperation(value = "查询要分派的计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(82)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer planId,
-                                           Integer status) {
-        return tmsTruckFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status);
-    }
-
-
-    //********************************************omsTruckOrderController*****************************
-
-    @ApiOperation(value = "查询所有运输订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(86)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType) {
-        return tmsTruckFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
-    }
-
-    @ApiOperation(value = "不适用表头返回数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
-        return tmsTruckFeign.getAllTruckOrder(orderStatus, planId, orderType);
-    }
-
-    @ApiOperation(value = "查询所有空闲的运力信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer carrierId
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsTruckFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
-    }
-
-    @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTruckFeign.addPurOrder(mapValue);
-    }
-    // == null ? new HashMap<>() : mapValue
-
-
-    @ApiOperation(value = "修改分派计划")
-    @PostMapping("/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map) {
-        return tmsTruckFeign.updateOrder(map);
-    }
-
-
-    @ApiOperation(value = "派单")
-    @PostMapping("/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId) {
-        return tmsTruckFeign.dispatchOrder(orderId);
-    }
-
-    @ApiOperation(value = "逻辑删除运单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     Integer planId) {
-        return tmsTruckFeign.deleteOrder(map, planId);
-    }
-
-    @ApiOperation(value = "司机接收、拒绝接单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
-        return tmsTruckFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
-    }
-
-
-    @ApiOperation(value="司机接单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               @PathVariable Integer orderReceiveStatus,
-                                               Integer orderType,
-                                               Integer orderStatus
-    ){
-        return tmsTruckFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
-                                                    pageSize, orderReceiveStatus, orderType, orderStatus);
-    }
-
-
-    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
-    })
-    @PostMapping("/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
-        return tmsTruckFeign.sendMesToDriver(capacityNumber, orderStatus);
-    }
-
-    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
-    })
-    @PostMapping("/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(String capacityNumber){
-        return tmsTruckFeign.sendMesToDriver(capacityNumber);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
-        return tmsTruckFeign.getOrderMesByOrderNum(orderId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
-        return tmsTruckFeign.selectPlaceAndTime(orderId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息")
-    @PostMapping("/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
-        return tmsTruckFeign.selectOrderByOrderId(orderId);
-    }
-
-    @ApiOperation(value="查看运输派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              @PathVariable Integer orderReceiveStatus,
-                                              Integer orderType,
-                                              Integer orderStatus){
-        return tmsTruckFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                                            orderReceiveStatus, orderType, orderStatus);
-    }
 
     //******************************************TmstruckLoadResultController***********************************
 

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

@@ -704,4 +704,48 @@ public interface AmsFeign {
     @GetMapping(value = "/api/v1/ams/amssaleplans/getAreaName")
     RESTfulResult getAreaName();
 
+    /*
+       AmstruckPurplanController中所有接口
+    */
+    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan")
+    RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                @RequestParam("apiId") Integer apiId,
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("status") Integer status);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan/{apiId}")
+    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+                                            @RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("pageNum")Integer pageNum,
+                                            @RequestParam("pageSize")Integer pageSize,
+                                            @RequestParam("con")String con);
+
+    @PostMapping ("api/v1/truckTms/amstruckpurplans/getPurPlanById/{planId}")
+    public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/addPurPlan")
+    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/sendPurPlan/{planId}")
+    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/receptionPurPlan/{planId}")
+    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId);
+
+
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/deletePurPlan/{planId}")
+    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/getDecomposedPlan")
+    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("planId") Integer planId,
+                                           @RequestParam("status") Integer status);
+
+
+
 }

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

@@ -0,0 +1,98 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/28 13:28
+ */
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.QMSFeign.url}")
+public interface OmsFeign {
+
+     /*
+    OmstruckOrderController
+     */
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrder")
+    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderStatus") Integer orderStatus,
+                                          @RequestParam("planId") Integer planId,
+                                          @RequestParam("orderType") Integer orderType);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrderReturnListMap")
+    public RESTfulResult getAllTruckOrder(
+            @RequestParam("orderStatus") Integer orderStatus,
+            @RequestParam("planId") Integer planId,
+            @RequestParam("orderType") Integer orderType);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllCapacity")
+    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("carrierId") Integer carrierId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/addPurOrder")
+    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/updateOrder")
+    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/dispatchOrder/{orderId}")
+    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/deleteOrder")
+    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam("planId") Integer planId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/driverReceiveOrRefuse/{orderId}")
+    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
+                                               @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("orderStatus") Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/sendMesToDriver")
+    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
+                                         @RequestParam("orderStatus") Integer orderStatus);
+
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getRefuseOrderByCapacityNum")
+    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getOrderMesByOrderNum/{orderId}")
+    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/selectPlaceAndTime/{orderId}")
+    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/selectOrderByOrderId/{orderId}")
+    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
+                                              @RequestParam("orderType") Integer orderType,
+                                              @RequestParam("orderStatus") Integer orderStatus);
+}

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

@@ -17,128 +17,6 @@ import java.util.Map;
 @FeignClient(name = "dil-tms-truck-dev", url = "${openfeign.TmsTruckFeign.url}")
 public interface TmsTruckFeign {
 
-    /*
-        AmstruckPurplanController中所有接口
-     */
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan")
-    RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                @RequestParam("apiId") Integer apiId,
-                                @RequestParam("pageNum") Integer pageNum,
-                                @RequestParam("pageSize") Integer pageSize,
-                                @RequestParam("status") Integer status);
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan/{apiId}")
-    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("pageNum")Integer pageNum,
-                                            @RequestParam("pageSize")Integer pageSize,
-                                            @RequestParam("con")String con);
-
-    @PostMapping ("api/v1/truckTms/amstruckpurplans/getPurPlanById/{planId}")
-    public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId);
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/sendPurPlan/{planId}")
-    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId);
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId);
-
-
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId);
-
-    @PostMapping("api/v1/truckTms/amstruckpurplans/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("planId") Integer planId,
-                                           @RequestParam("status") Integer status);
-
-
-    /*
-    OmstruckOrderController
-     */
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderStatus") Integer orderStatus,
-                                          @RequestParam("planId") Integer planId,
-                                          @RequestParam("orderType") Integer orderType);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(
-            @RequestParam("orderStatus") Integer orderStatus,
-            @RequestParam("planId") Integer planId,
-            @RequestParam("orderType") Integer orderType);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("carrierId") Integer carrierId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     @RequestParam("planId") Integer planId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
-                                               @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("orderStatus") Integer orderStatus);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
-                                         @RequestParam("orderStatus") Integer orderStatus);
-
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/truckTms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
-                                              @RequestParam("orderType") Integer orderType,
-                                              @RequestParam("orderStatus") Integer orderStatus);
-
     /*
     TmstruckLoadResultController
      */