xiyga

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.annotaion.RequestLimit;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.RmsFeign;
 import com.steerinfo.dil.feign.TmsFeign;
+import com.steerinfo.dil.feign.WlTmsFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ExcelToolUtils;
@@ -52,6 +53,9 @@ public class TMSController extends BaseRESTfulController {
     @Autowired
     private RmsFeign rmsFeign;
 
+    @Autowired
+    WlTmsFeign wlTmsFeign;
+
     @Autowired
     private UniversalMapper universalMapper;
 
@@ -114,7 +118,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/batchDispatch")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsFeign.batchDispatch(map);
+        return wlTmsFeign.batchDispatch(map);
     }
 
     @ApiOperation(value = "批量派发运输订单")
@@ -122,7 +126,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/batchDispatchSc")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> batchDispatchSc(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsFeign.batchDispatchSc(map);
+        return wlTmsFeign.batchDispatchSc(map);
     }
 
     @ApiOperation(value = "修改运输订单")
@@ -163,7 +167,7 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer pageNum,
                                                  Integer pageSize) {
-        return tmsFeign.getTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return wlTmsFeign.getTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询运输订单所有运输实绩")
@@ -265,7 +269,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/saleDispatchOrder")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsFeign.saleDispatchOrder(map);
+        return wlTmsFeign.saleDispatchOrder(map);
     }
 
     @ApiOperation(value = "批量销售派发运输订单")
@@ -273,7 +277,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/saleDispatchOrderList")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> saleDispatchOrderList(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsFeign.saleDispatchOrderList(map);
+        return wlTmsFeign.saleDispatchOrderList(map);
     }
 
     @ApiOperation(value = "查询销售运输订单")

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

@@ -0,0 +1,441 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/9/28 9:30
+ */
+
+@FeignClient(name = "ANTAI-WLTMS-API", url = "${openfeign.WlTmsFeign.url}", configuration = MyFeignRequestInterceptor.class)
+public interface WlTmsFeign {
+
+    //======================>车辆综合实绩
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/gettmscomprehensiveresult")
+    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
+    Map<String, Object> addComprehensiveResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
+    Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/batchUpdate")
+    Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) List<Map<String, Object>> map);
+
+    @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
+    Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/dispatchOrder")
+    Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wltms/omstransorders/batchDispatch")
+    Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/updateTransOrder")
+    Map<String, Object> updateTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/mergeTransOrder")
+    Map<String, Object> mergeTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wltms/omstransorders/getTransOrderList")
+    Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
+
+
+    @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
+    Map<String, Object> changeTransOrder(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/receiptOrder")
+    Map<String, Object> receiptOrder(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getTransResult")
+    Map<String, Object> getTransResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsenfactoryresults/syncEnfactoryResult")
+    Map<String, Object> syncEnfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/syncOutfactoryResult")
+    Map<String, Object> syncOutfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsweightresults/syncWeightResult")
+    Map<String, Object> syncWeightResult(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmstimingresults/startend")
+    Map<String, Object> startend(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/updCountResult")
+    Map<String, Object> updCountResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/approveTimeResult")
+    Map<String, Object> approveTimeResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/resendTimeResult")
+    Map<String, Object> resendTimeResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsUpdate")
+    Map<String, Object> tmstimingresultsUpdate(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
+    Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmstimingresults/getOrderTimeList")
+    Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmstimingresults/getTimeList")
+    Map<String, Object> getTimeList(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wltms/omstransorders/saleDispatchOrder")
+    Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wltms/omstransorders/saleDispatchOrderList")
+    Map<String, Object> saleDispatchOrderList(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
+    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSiz);
+
+
+    @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
+    Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/signIn")
+    Map<String, Object> signIn(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/replaceFront")
+    Map<String, Object> replaceFront(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmsloadresults/load")
+    Map<String, Object> load(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsloadresults/loadUpd")
+    Map<String, Object> loadUpd(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/unload")
+    Map<String, Object> unload(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/unloadUpd")
+    Map<String, Object> unloadUpd(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/arrival")
+    Map<String, Object> arrival(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/receipt")
+    Map<String, Object> receipt(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getCountEnfactory")
+    Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/getSignInResultList")
+    Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/getReplaceFrontResultList")
+    Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/getOutfactoryResultList")
+    Map<String, Object> getOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/getLoadResultList")
+    Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadList")
+    Map<String, Object> purchaseTrainLoadList(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadReport")
+    Map<String, Object> purchaseTrainLoadReport(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoad")
+    Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsloadresults/deleteTrainLoad")
+    Map<String, Object> deleteTrainLoad(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoadSeq")
+    Map<String, Object> updateTrainLoadSeq(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeightList")
+    Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+
+    @PostMapping("api/v1/tms/tmsunloadresults/purchaseTrainUnloadList")
+    Map<String, Object> purchaseTrainUnloadList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeight")
+    Map<String, Object> purchaseTrainWeight(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
+    Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsweightresults/getWeightResultList")
+    Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsqualityresults/getQualityResultList")
+    Map<String, Object> getQualityResultList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/getArrivalResultList")
+    Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/getReceiptResultList")
+    Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/updateWeight")
+    RESTfulResult updateWeight(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoad")
+    Map<String, Object> purchaseTrainLoad(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/purchaseTrainUnload")
+    Map<String, Object> purchaseTrainUnload(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
+    Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/omstransorders/getDriverTotalResult")
+    Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/getCapacityTotalResult")
+    Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/omstransorders/dispatchTask")
+    Map<String, Object> dispatchTask(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/omstransorders/getDlivDirnoSeqList/{id}")
+    RESTfulResult getDlivDirnoSeqList(@PathVariable("id") String id);
+
+    @PostMapping(value = "/api/v1/tms/omstransorders/updateDlivDirnoSeq")
+    RESTfulResult updateDlivDirnoSeq(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/omstransorders/selectDlivDirnoSeqDetails")
+    RESTfulResult selectDlivDirnoSeqDetails(@RequestBody Map<String, Object> map);
+
+
+    @PostMapping(value = "/api/v1/tms/tmsrouteresults/getPathByOrder")
+    RESTfulResult getPathByOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsrouteresults/uploadLocation")
+    RESTfulResult uploadLocation(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/wltms/omstransorders/batchDispatchSc")
+    Map<String, Object> batchDispatchSc(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsweightresults/checkWeightResult")
+    Map<String, Object> checkWeightResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchList")
+    RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/syncProductionResult")
+    RESTfulResult syncProductionResult(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getDriverDayJobForApp")
+    RESTfulResult getDriverDayJobForApp(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/outBound")
+    RESTfulResult outBound(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/revokeOutBound")
+    RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/likeTransitOrders")
+    Map<String, Object> likeTransitOrders(@RequestBody Map<String, Object> objectMap,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/insertTmsTransitOrder")
+    Map<String, Object> insertTmsTransitOrder(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/importTrasitOrder")
+    Map<String, Object> importTrasitOrder(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/getPleaseApproveList")
+    Map<String, Object> getPleaseApproveList(@RequestBody Map<String, Object> objectMap,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/addPleaseApprove")
+    Map<String, Object> addPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/updPleaseApprove")
+    Map<String, Object> updPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/delPleaseApprove")
+    Map<String, Object> delPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/gatepostTransitManager")
+    Map<String, Object> gatepostTransitManager(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmscomprehensiveresults/importComprehensiveResult")
+    Map<String, Object> importComprehensiveResult(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/changeTransOrderH")
+    Map<String, Object> changeTransOrderH(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/updateCarNo")
+    Map<String, Object> updateCarNo(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/likeQueueGrid")
+    Map<String, Object> likeQueueGrid(@RequestBody Map<String, Object> objectMap,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueueresults/likeQueueResult")
+    Map<String, Object> likeQueueResult(@RequestBody Map<String, Object> objectMap,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/disposeQueueGrid")
+    Map<String, Object> disposeQueueGrid(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueueresults/disposeQueueResult")
+    Map<String, Object> disposeQueueResult(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/tms/tmsqueuegrids/getGridAllData")
+    Map<String, Object> getGridAllData(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/omstransorders/banTransOrder")
+    Map<String, Object> banTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/loadingOperation")
+    Map<String, Object> loadingOperation(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/updateTrainOrderSeq")
+    Map<String, Object> updateTrainOrderSeq(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/purchaseTrainsOrderList")
+    Map<String, Object> purchaseTrainsOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/tms/tmsloadresults/disposeHandling")
+    Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/getgenerateOperateDaily")
+    Map<String, Object> getgenerateOperateDaily(@RequestBody Map<String, Object> map);   @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListIn")
+    RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListOut")
+    RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListRevokeOut")
+    RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListRevokeIn")
+    RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/modifyChange")
+    RESTfulResult modifyChange(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmstimingresults/resartStartTimming")
+    RESTfulResult resartStartTimming(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/correctTransOrder")
+    Map<String, Object> correctTransOrder(Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/fixedDispatch")
+    Map<String, Object> fixedDispatch();
+
+    @PostMapping("/api/v1/tms/omstransorders/getDispatchRules")
+    Map<String, Object> getDispatchRules(@RequestBody Map<String, Object> params);
+
+    @PostMapping("/api/v1/tms/omstransorders/getZtZxShiji")
+    Map<String, Object> getZtZxShiji(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/tms/omstransorders/disposeMatchLoadData")
+    Map<String, Object> disposeMatchLoadData(@RequestBody(required = false) Map<String, Object> map);
+
+}
+
+
+
+
+
+

src/main/resources/application-prod.yml

@@ -36,6 +36,9 @@ openfeign:
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8086}
 #    url: ${TMSFEIGN_URL:localhost:8086}
+  WlTmsFeign:
+    url: ${WLTMSFEIGN_URL:172.16.90.202:8098}
+#    url: ${WLTMSFEIGN_URL:localhost:8098}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -443,20 +443,8 @@
         PERSONNEL_NAME "label",
         PERSONNEL_NAME "text",
         'personnelName' "prop"
-        <if test="capacityId!=null and capacityId!=''">
-            ,NVL(T ."countNumber",0) "countNumber"
-        </if>
         FROM
         RMS_PERSONNEL RP
-        <if test="capacityId!=null and capacityId!=''">
-            LEFT JOIN (
-            SELECT DRIVER_ID "driverId",
-            COUNT(DRIVER_ID) "countNumber"
-            FROM OMS_TRANS_ORDER
-            WHERE CAPACITY_ID = #{capacityId}
-            GROUP BY DRIVER_ID
-            ) T ON T."driverId" = RP .PERSONNEL_ID
-        </if>
         WHERE DELETED != -1
         <if test="isNC!=null">
             AND SOURCE_ID IS NOT NULL
@@ -488,9 +476,6 @@
                 and "personnelId" &lt; #{lastIndex}
             </if>
         </where>
-        <if test="capacityId!=null and capacityId!=''">
-            ORDER BY "countNumber" DESC
-        </if>
         <if test="!(capacityId!=null and capacityId!='')">
             order by LENGTH("label") ASC,"personnelId" desc
         </if>
@@ -510,28 +495,13 @@
             PERSONNEL_NAME "label",
             PERSONNEL_NAME "text",
             'personnelName' "prop"
-            <if test="capacityId!=null and capacityId!=''">
-                ,NVL(T ."countNumber",0) "countNumber"
-            </if>
             from RMS_PERSONNEL RP
-            <if test="capacityId!=null and capacityId!=''">
-                LEFT JOIN (
-                SELECT DRIVER_ID "driverId",
-                COUNT(DRIVER_ID) "countNumber"
-                FROM OMS_TRANS_ORDER
-                WHERE CAPACITY_ID = #{capacityId}
-                GROUP BY DRIVER_ID
-                ) T ON T."driverId" = RP .PERSONNEL_ID
-            </if>
             WHERE PERSONNEL_ID in
             <foreach collection="id" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
         )
-        <if test="capacityId!=null and capacityId!=''">
-            ORDER BY "countNumber" DESC
-        </if>
     </select>
 
     <select id="getCapacityByLike" resultType="java.util.Map">
@@ -553,15 +523,8 @@
         RCA.CAPACITY_NUMBER "text",
         RCA.REMARK1 "remark1",
         RCA.CAPACITY_NUMBER "capacityNumber",
-        (case
-        when oto.capacity_id is null then '空闲'
-        when oto.deleted != '2' and oto.capacity_id is not null then '已派'
-        end) "status",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ,NVL(T ."countNumber",0) "countNumber"
-        </if>
         FROM
         RMS_CAPACITY RCA
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
@@ -569,25 +532,6 @@
         <if test="requirementSerialNumber != null and requirementSerialNumber.contains('DF')">
             LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
         </if>
-        left join oms_trans_order oto
-        on RCA.capacity_id = oto.capacity_id
-        and oto.deleted between 4 and 5
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            LEFT JOIN (
-            SELECT CAPACITY_ID "capacityId",
-            COUNT( CAPACITY_ID ) "countNumber"
-            FROM OMS_TRANS_ORDER
-            <where>
-                <if test="driverId!=null and driverId!=''">
-                    AND (DRIVER_ID = #{driverId} OR DRIVER_ID2 = #{driverId})
-                </if>
-                <if test="driverId2!=null and driverId2!=''">
-                    AND DRIVER_ID = #{driverId2} OR DRIVER_ID2 = #{driverId2}
-                </if>
-            </where>
-            GROUP BY CAPACITY_ID
-            ) T ON T."capacityId" = RCA .CAPACITY_ID
-        </if>
         WHERE RCA .DELETED in( 0,3)
         <if test="capacityTypeId !=null">
             AND RCT.CAPACITY_TYPE_ID in (
@@ -611,10 +555,6 @@
         <if test="requirementSerialNumber != null and requirementSerialNumber.contains('DF')">
             AND RCD.deleted = 5
         </if>
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ORDER BY "countNumber" DESC
-        </if>
-
         )
         <where>
             <if test="index!=null and index!=''">
@@ -640,45 +580,16 @@
             RCA.CAPACITY_NUMBER "text",
             RCA.REMARK1 "remark1",
             RCA.CAPACITY_NUMBER "capacityNumber",
-            (case
-            when oto.capacity_id is null then '空闲'
-            when oto.deleted != '2' and oto.capacity_id is not null then '已派'
-            end) "status",
             RCT.CAPACITY_TYPE_NAME "capacityTypeName",
             'capacityNumber' "prop"
-            <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-                ,NVL(T ."countNumber",0) "countNumber"
-            </if>
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
-            left join oms_trans_order oto
-            on RCA.capacity_id = oto.capacity_id
-            and oto.deleted != 2
-            <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-                LEFT JOIN (
-                SELECT CAPACITY_ID "capacityId",
-                COUNT( CAPACITY_ID ) "countNumber"
-                FROM OMS_TRANS_ORDER
-                <where>
-                    <if test="driverId!=null and driverId!=''">
-                        AND (DRIVER_ID = #{driverId} OR DRIVER_ID2 = #{driverId})
-                    </if>
-                    <if test="driverId2!=null and driverId2!=''">
-                        AND DRIVER_ID = #{driverId2} OR DRIVER_ID2 = #{driverId2}
-                    </if>
-                </where>
-                GROUP BY CAPACITY_ID
-                ) T ON T."capacityId" = RCA .CAPACITY_ID
-            </if>
             WHERE RCA .CAPACITY_ID in
             <foreach collection="id" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
         )
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ORDER BY "countNumber" DESC
-        </if>
     </select>
 
     <select id="getCapacityByLikeSc" resultType="java.util.Map">
@@ -727,41 +638,13 @@
         then RCA.CAPACITY_NUMBER
         else RCA.REMARK1
         end "capacityNumber",
-        (case
-        when RCA.deleted = '3' then '维保'
-        when oto.capacity_id is null then '空闲'
-        when oto.deleted != '2' and oto.capacity_id is not null then '已派'
-        when oto.deleted = '2' and oto.capacity_id is not null then '空闲'
-        end) "status",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ,NVL(T ."countNumber",0) "countNumber"
-        </if>
         FROM
         RMS_CAPACITY RCA
         LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
         LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
-        left join oms_trans_order oto
-        on RCA.capacity_id = oto.capacity_id
-        and oto.deleted between 4 and 5
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            LEFT JOIN (
-            SELECT CAPACITY_ID "capacityId",
-            COUNT( CAPACITY_ID ) "countNumber"
-            FROM OMS_TRANS_ORDER
-            <where>
-                <if test="driverId!=null and driverId!=''">
-                    AND (DRIVER_ID = #{driverId} OR DRIVER_ID2 = #{driverId})
-                </if>
-                <if test="driverId2!=null and driverId2!=''">
-                    AND DRIVER_ID = #{driverId2} OR DRIVER_ID2 = #{driverId2}
-                </if>
-            </where>
-            GROUP BY CAPACITY_ID
-            ) T ON T."capacityId" = RCA .CAPACITY_ID
-        </if>
         WHERE RCA .DELETED in (0,3)
         <if test="capacityType != null and capacityType != '' ">
             AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
@@ -780,9 +663,6 @@
         <if test="capacityId!=null and capacityId!=''">
             AND RCA .CAPACITY_ID = #{capacityId}
         </if>
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ORDER BY "countNumber" DESC
-        </if>
         <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
             order by length("capacityNumber"),"capacityNumber"
         </if>
@@ -837,47 +717,18 @@
             then RCA.CAPACITY_NUMBER
             else RCA.REMARK1
             end "capacityNumber",
-            (case
-            when oto.capacity_id is null then '空闲'
-            when oto.deleted != '2' and oto.capacity_id is not null then '已派'
-            end) "status",
             RCT.CAPACITY_TYPE_NAME "capacityTypeName",
             'capacityNumber' "prop"
-            <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-                ,NVL(T ."countNumber",0) "countNumber"
-            </if>
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
             LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
-            left join oms_trans_order oto
-            on RCA.capacity_id = oto.capacity_id
-            and oto.deleted != 2
-            <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-                LEFT JOIN (
-                SELECT CAPACITY_ID "capacityId",
-                COUNT( CAPACITY_ID ) "countNumber"
-                FROM OMS_TRANS_ORDER
-                <where>
-                    <if test="driverId!=null and driverId!=''">
-                        AND (DRIVER_ID = #{driverId} OR DRIVER_ID2 = #{driverId})
-                    </if>
-                    <if test="driverId2!=null and driverId2!=''">
-                        AND DRIVER_ID = #{driverId2} OR DRIVER_ID2 = #{driverId2}
-                    </if>
-                </where>
-                GROUP BY CAPACITY_ID
-                ) T ON T."capacityId" = RCA .CAPACITY_ID
-            </if>
             WHERE RCA .CAPACITY_ID in
             <foreach collection="id" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
         )
-        <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
-            ORDER BY "countNumber" DESC
-        </if>
     </select>
 
     <select id="getrmsrmsjobinfosBylike" resultType="java.util.Map">
@@ -1740,7 +1591,6 @@
         RP.PERSONNEL_PHONE "personnelPhone",
         RP.IDENTITY_CARD "personnelCard",
         RP.INNNER_CODE "innerCode",
-        oto.oto_count+oto2.oto_count "orders",
         to_char(RP.SSO_ID) "ssoId",
         RP.PERSONNEL_ID "id",
         RP.PERSONNEL_ID "value",
@@ -1750,24 +1600,8 @@
             RCD.group_number "groupNumber",
         </if>
         'personnelName' "prop"
-        <if test="capacityId!=null and capacityId!=''">
-            ,NVL(T ."countNumber",0) "countNumber"
-        </if>
         FROM
         RMS_PERSONNEL RP
-        left join (select count(*) oto_count,oto.driver_id from oms_trans_order oto group by oto.driver_id) oto
-        on oto.driver_id = RP.PERSONNEL_ID
-        left join (select count(*) oto_count,oto.driver_id2 from oms_trans_order oto group by oto.driver_id2) oto2
-        on oto2.driver_id2 = RP.PERSONNEL_ID
-        <if test="capacityId!=null and capacityId!=''">
-            LEFT JOIN (
-            SELECT DRIVER_ID "driverId",
-            COUNT(DRIVER_ID) "countNumber"
-            FROM OMS_TRANS_ORDER
-            WHERE CAPACITY_ID = #{capacityId}
-            GROUP BY DRIVER_ID
-            ) T ON T."driverId" = RP .PERSONNEL_ID
-        </if>
         <if test="driverCapacityId!=null and driverCapacityId!=''">
             LEFT JOIN RMS_CAPACITY_DRIVER RCD on rcd.personnel_id = RP.personnel_id
         </if>
@@ -1799,9 +1633,6 @@
                 and "personnelId" &lt; #{lastIndex}
             </if>
         </where>
-        <if test="capacityId!=null and capacityId!=''">
-            ORDER BY "countNumber" DESC
-        </if>
         <if test="!(capacityId!=null and capacityId!='')">
             order by "personnelId" desc
         </if>
@@ -1816,7 +1647,6 @@
             RP.PERSONNEL_PHONE "personnelPhone",
             RP.IDENTITY_CARD "personnelCard",
             RP.INNNER_CODE "innerCode",
-            oto.oto_count+oto2.oto_count "orders",
             to_char(RP.SSO_ID) "ssoId",
             RP.PERSONNEL_ID "id",
             RP.PERSONNEL_ID "value",
@@ -1826,23 +1656,7 @@
                 RCD.group_number "groupNumber",
             </if>
             'personnelName' "prop"
-            <if test="capacityId!=null and capacityId!=''">
-                ,NVL(T ."countNumber",0) "countNumber"
-            </if>
             from RMS_PERSONNEL RP
-            left join (select count(*) oto_count,oto.driver_id from oms_trans_order oto group by oto.driver_id) oto
-            on oto.driver_id = RP.PERSONNEL_ID
-            left join (select count(*) oto_count,oto.driver_id2 from oms_trans_order oto group by oto.driver_id2) oto2
-            on oto2.driver_id2 = RP.PERSONNEL_ID
-            <if test="capacityId!=null and capacityId!=''">
-                LEFT JOIN (
-                SELECT DRIVER_ID "driverId",
-                COUNT(DRIVER_ID) "countNumber"
-                FROM OMS_TRANS_ORDER
-                WHERE CAPACITY_ID = #{capacityId}
-                GROUP BY DRIVER_ID
-                ) T ON T."driverId" = RP .PERSONNEL_ID
-            </if>
             <if test="driverCapacityId!=null and driverCapacityId!=''">
                 LEFT JOIN RMS_CAPACITY_DRIVER RCD on rcd.personnel_id = RP.personnel_id
             </if>
@@ -1852,9 +1666,6 @@
             </foreach>
         </if>
         )
-        <if test="capacityId!=null and capacityId!=''">
-            ORDER BY "countNumber" DESC
-        </if>
     </select>
 
     <select id="getConfigByName" resultType="java.util.Map">