12.31rms修改

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

@@ -758,7 +758,7 @@ public class RMScontroller {
     }
 
     //油价
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiOperation(value = "获取油价信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -825,4 +825,27 @@ public class RMScontroller {
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertWarehouse(map);
     }
+
+    //展示收货客户信息
+    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", 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(value = "/getConsigneeList")
+    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String con
+    ) {
+
+        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
 }

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

@@ -453,6 +453,12 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
-
+  //展示收货客户信息
+  @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeList")
+  Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
 
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/bootstrap.yml

@@ -24,10 +24,7 @@ eureka:
 
 
 openfeign:
-<<<<<<< HEAD
-#  #正式环境
-=======
-  #正式环境
+#  正式环境
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -53,64 +50,35 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_URL:172.16.33.166:8060}
->>>>>>> master
+      url: ${RMSFEIGN_HRL:localhost:8060}
 
-
-#    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}
+# 测试环境
+#  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
@@ -143,4 +111,4 @@ mybatis:
 server:
 #  port: 8080
 #测试环境
-  port: 8019
+  port: 8080