合并分支

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

@@ -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
     ){
 
@@ -718,7 +734,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) {
@@ -741,6 +757,58 @@ 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);
+    }
+
 
 //*******************************下拉框************************
 

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

@@ -108,6 +108,13 @@ public interface RmsFeign {
     //    根据id获取承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
     Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+//    展示中标区域
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierBidAreaList")
+    Map<String, Object> getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
 
     //获取物资列表
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
@@ -416,6 +423,29 @@ public interface RmsFeign {
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
 
 
+    //油价
+    @PostMapping(value = "/api/v1/rms/rmsoilprice/getOilPriceResultList")
+    Map<String, Object> getOilPriceResultList(@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/rmsoilprice/insertOilPrice")
+    Map<String,Object> insertOilPrice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/deleteOilPrice/{id}")
+    Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
+
+    //更新油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
+    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")
+    Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id);
+
 //******************************************下拉框*******************************
 
 
@@ -424,4 +454,5 @@ public interface RmsFeign {
     Map<String,Object> getNoticeTypeId();
 
 
+
 }

src/main/resources/bootstrap.yml

@@ -24,7 +24,37 @@ eureka:
 
 
 openfeign:
+<<<<<<< HEAD
 #  #正式环境
+=======
+  #正式环境
+    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}
+>>>>>>> master
 
 
 #    ColumnDataFeign: