修改承运商

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

@@ -734,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) {
@@ -757,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/controller/WMSHController.java

@@ -5,9 +5,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,6 +16,8 @@ import java.util.Map;
  * @GreateTime:2021/10/12 9:54
  * @Version:V2.0
  */
+@RestController
+@RequestMapping("${api.version}/wmsh")
 public class WMSHController extends BaseRESTfulController {
 
     @Autowired

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

@@ -423,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);
+
 //******************************************下拉框*******************************
 
 

src/main/resources/bootstrap.yml

@@ -50,7 +50,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:localhost:8060}
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
 
   #测试环境
 #  ColumnDataFeign:
@@ -109,4 +109,4 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8070
+  port: 8080