集合框计算

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

@@ -45,7 +45,7 @@ public class AMScontroller{
     }
 
     /*
-
+        框计算
      */
     @PostMapping("/getAllPurPlan/{apiId}")
     public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,

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

@@ -760,10 +760,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getBatchId();
     }
 
-    @ApiOperation(value="获取装车车皮号")
-    @GetMapping(value = "/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType){
-        return tmsTrainFeign.getWagonNo(resultType);
+    @ApiOperation(value = "获取已装车还未卸车车皮")
+    @PostMapping(value = "/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
+                                          @RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize){
+        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value="查询所有发运计划")
@@ -1035,8 +1039,8 @@ public class TMSController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer status,
-                                          Integer orderType){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType);
+                                          Integer orderType, String con){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con);
     }
 
     @ApiOperation(value="新增汽车装车实绩")
@@ -1090,9 +1094,10 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                                     Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
     @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
@@ -1127,8 +1132,8 @@ public class TMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                                 Integer orderType){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+                                                 Integer orderType,String con){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
     @ApiOperation(value="查询计皮实绩")
@@ -1144,8 +1149,9 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                                Integer orderType) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+                                          Integer orderType,
+                                                String con) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
 
@@ -1182,9 +1188,10 @@ public class TMSController extends BaseRESTfulController {
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         Integer orderType
+                                         Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
     @ApiOperation(value="添加卸货实绩")
@@ -1220,9 +1227,9 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                                Integer orderType
+                                                Integer orderType,String con
     ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
 
@@ -1242,11 +1249,12 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                                     Integer orderType
+                                               Integer orderType,String con
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
+
     @ApiOperation(value="PAD扫描汽车出厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
@@ -1281,9 +1289,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,String con
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
     @ApiOperation(value="通过ID获取质检实绩 ")

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -60,10 +61,13 @@ public interface TmsTrainFeign {
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
     public Map<String, Object> getBatchId();
 
-
-    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType")Integer resultType);
-
+    @ApiOperation(value = "获取已装车还未卸车车皮")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
+                                    @RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize);
 
     /*
         TmstrainWagonUnloadResultController

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

@@ -27,8 +27,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("status") Integer status ,
-                                                @RequestParam("orderType") Integer orderType);
+                                          @RequestParam("status") Integer status ,
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con") String con);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
     public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -70,7 +71,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType")Integer orderType
+                                               @RequestParam("orderType")Integer orderType,
+                                               @RequestParam("con")      String con
     );
 
 
@@ -99,7 +101,8 @@ public interface TmsTruckFeign {
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("orderType") Integer orderType
+                                                 @RequestParam("orderType") Integer orderType,
+                                                 @RequestParam("con")     String con
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -107,7 +110,8 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("orderType") Integer orderType);
+                                                @RequestParam("orderType") Integer orderType,
+                                                @RequestParam("con") String con);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -125,7 +129,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("con")      String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -144,7 +149,8 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType);
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con")  String con);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -156,7 +162,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con") String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
@@ -178,7 +185,8 @@ public interface TmsTruckFeign {
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("con")String con);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: [name]

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: [name]

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/