Browse Source

资源管理提交

hujh 3 years ago
parent
commit
f21906033a

+ 24 - 4
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -800,7 +800,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"),
@@ -850,9 +850,6 @@ public class RMScontroller {
     public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getOilPriceById(id);
     }
-
-
-
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -861,6 +858,29 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+
+    //展示收货客户信息
+    @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);
+    }
+
     @GetMapping("getPortType")
     @ApiOperation(value = "得到港口类型Id")
     public Map<String,Object> getPortType(){

+ 8 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -453,6 +453,14 @@ 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);
+
     //港口
     @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
     Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);

+ 7 - 4
src/main/resources/bootstrap.yml

@@ -24,7 +24,8 @@ eureka:
 
 
 openfeign:
-  #正式环境
+#  正式环境
+
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -40,7 +41,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -50,8 +51,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:localhost:8095}
     RmsFeign:
-      url: ${RMSFEIGN_URL:172.16.33.166:8060}
-
+      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
 
   #测试环境
 #  ColumnDataFeign:
@@ -81,6 +81,7 @@ openfeign:
 #  RmsFeign:
 #    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+
 genxml:
   pth: com/a
 cache:
@@ -110,4 +111,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
+#  port: 8080
+#测试环境
   port: 8080