资源管理提交

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"),
@@ -809,6 +809,49 @@ public class RMScontroller {
         return rmsFeign.getOilPriceById(id);
     }
 
+    //港口
+    @ApiOperation(value = "获取港口", notes = "分页查询")
+    @PostMapping(value = "/getPort")
+    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    //码头
+    @ApiOperation(value = "获取码头", notes = "分页查询")
+    @PostMapping(value = "/getPier")
+    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
+    @PostMapping(value = "/getYardList")
+    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
 
 //*******************************下拉框************************
 
@@ -818,11 +861,71 @@ 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(){
+        return rmsFeign.getPortType();
+    }
+
     @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertWarehouse(map);
     }
+
+    //港口
+    @PostMapping("/insertPort")
+    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPort(map);
+    }
+
+    //
+    @PostMapping("/insertPier")
+    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPier(map);
+    }
+
+    //港口
+    @PostMapping("/insertPortYard")
+    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPortYard(map);
+    }
+
+    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
+    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
+        return rmsFeign.deletePort(portId);
+    }
+
+    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
+    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
+        return rmsFeign.deletePier(pierId);
+    }
+
+    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
+    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
+        return rmsFeign.deletePortYard(warehouseId);
+    }
 }

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

@@ -453,6 +453,59 @@ 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);
+
+    //删除港口
+    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
+    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
+
+    //删除码头
+    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
+    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
+    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
+    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
+    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
+
+    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
+    Map<String, Object> getPortType();
+
+
+    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
+    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
+    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
 
+    //删除港存堆场
+    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
+    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
 
 }

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

@@ -25,60 +25,62 @@ eureka:
 
 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}
+    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:localhost:8066}
+
+# 测试环境
+#  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
@@ -111,4 +113,4 @@ mybatis:
 server:
 #  port: 8080
 #测试环境
-  port: 8019
+  port: 8088