|
@@ -180,6 +180,23 @@ public class RMScontroller {
|
|
|
public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
|
|
|
return rmsFeign.getCarrierById(id);
|
|
|
}
|
|
|
+// 获取中标区域
|
|
|
+ @ApiOperation(value="展示中标区域信息")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
|
|
|
+ @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
|
|
|
+ @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
|
|
|
+ @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
|
|
|
+ })
|
|
|
+ @PostMapping("/getCarrierBidAreaList")
|
|
|
+ public Map<String, Object> getCarrierBidAreaList(@RequestBody(required=false) Map<String,Object> mapValue,
|
|
|
+ Integer apiId,
|
|
|
+ Integer pageNum,
|
|
|
+ Integer pageSize,
|
|
|
+ String con
|
|
|
+ ){
|
|
|
+ return rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
|
|
|
+ }
|
|
|
|
|
|
//获取物资列表
|
|
|
@ApiOperation(value="获取物资列表")
|
|
@@ -242,7 +259,6 @@ public class RMScontroller {
|
|
|
Integer apiId,
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
-
|
|
|
String con
|
|
|
){
|
|
|
|
|
@@ -696,8 +712,6 @@ public class RMScontroller {
|
|
|
@ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
|
|
|
@ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
|
|
|
})
|
|
|
-
|
|
|
-
|
|
|
@PostMapping(value = "/getNoticeList")
|
|
|
public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
Integer apiId,
|
|
@@ -718,7 +732,7 @@ public class RMScontroller {
|
|
|
return rmsFeign.insertNotice(map);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
|
|
|
+ @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
|
|
|
@ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
|
|
|
@PostMapping(value = "/updateNotice", produces = "application/json;charset=UTF-8")
|
|
|
public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
|
|
@@ -733,6 +747,50 @@ public class RMScontroller {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ //港口
|
|
|
+ @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);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
|
|
|
@ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
|
|
@@ -741,7 +799,57 @@ public class RMScontroller {
|
|
|
return rmsFeign.getNoticeById(id);
|
|
|
}
|
|
|
|
|
|
+ //油价
|
|
|
+ @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 = "/getOilPriceResultList")
|
|
|
+ public Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
+ Integer apiId,
|
|
|
+ Integer pageNum,
|
|
|
+ Integer pageSize,
|
|
|
+ String con
|
|
|
+ ) {
|
|
|
+ if (mapValue == null) {
|
|
|
+ mapValue = new HashMap<>();
|
|
|
+ }
|
|
|
+ return rmsFeign.getOilPriceResultList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value="新增油价信息", notes="根据DilNotice对象创建")
|
|
|
+ @ApiImplicitParam(name = "addOilPrice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
|
|
|
+ @PostMapping(value = "/insertOilPrice")
|
|
|
+ public Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map) {
|
|
|
+ return rmsFeign.insertOilPrice(map);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
|
|
|
+ @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
|
|
|
+ @PostMapping(value = "/updateOilPrice", produces = "application/json;charset=UTF-8")
|
|
|
+ public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map) {
|
|
|
+ return rmsFeign.updateOilPrice(map);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
|
|
|
+ @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
|
|
|
+ @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
|
|
|
+ public Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id) {
|
|
|
+ return rmsFeign.deleteOilPrice(id);
|
|
|
+ }
|
|
|
|
|
|
+ @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
|
|
|
+ @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
|
|
|
+ @PostMapping(value = "/getOilPriceById/{id}")
|
|
|
+ public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
|
|
|
+ return rmsFeign.getOilPriceById(id);
|
|
|
+ }
|
|
|
//*******************************下拉框************************
|
|
|
|
|
|
@GetMapping("getNoticeTypeId")
|
|
@@ -750,11 +858,72 @@ 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);
|
|
|
+ }
|
|
|
}
|