合并master分支代码

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

@@ -677,4 +677,10 @@ public class OMSController {
     public Map<String, Object> getCapacityAllOrder(String capacityNumber){
         return omsFeign.getCapacityAllOrder(capacityNumber);
     }
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("/getDriverConfirmation")
+    public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
+        return omsFeign.getDriverConfirmation(map);
+    }
 }

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

@@ -386,5 +386,8 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
     Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
 
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
+    Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
 }
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -89,5 +89,5 @@ public interface UniversalMapper {
     Integer getSaleOrderStatus(BigDecimal orderId);
 
     //通过运输订单号查询订单类型和ID
-    Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+        Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
 }

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -7,3 +8,33 @@ spring:
   application:
     name: dil-api
 
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+  RmsFeign:
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+
+server:
+  port: 8019

src/main/resources/application-prod.yml

@@ -1,3 +1,4 @@
+# 正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,4 +6,35 @@ spring:
     username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-api
+    name: dil-api
+
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+
+server:
+  port: 8080

src/main/resources/bootstrap.yml

@@ -21,62 +21,6 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-openfeign:
-  #  正式环境
-  #    ColumnDataFeign:
-  #      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  #    AmsFeign:
-  #      url: ${AMSFEIGN_URL:172.16.33.166:8079}
-  #    BmsshipFeign:
-  #      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  #    BmstrainFeign:
-  #      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-  #    BmstruckFeign:
-  #      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  #    QmsTruckFeign:
-  #      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-  #    TmsTrainFeign:
-  #      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-  #    TmsTruckFeign:
-  #      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  #    TmsshipFeign:
-  #      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-  #    WMSHFeign:
-  #      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-  #    WMSFeign:
-  #      url: ${WMSFEIGN_URL:172.16.33.166:8093}
-  #    OMSFeign:
-  #      url: ${OMSFEIGN_URL:172.16.33.166:8095}
-  #    RmsFeign:
-  #      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
-
-  #测试环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-  RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
@@ -97,8 +41,6 @@ redis:
     time: 864000000
   database: 0
 
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -106,8 +48,4 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-server:
-  #  port: 8080
-  #测试环境
-  port: 8019