Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1670,6 +1670,13 @@ public class AMScontroller{
         return amsFeign.insertNotice(map);
     }
 
+    @ApiOperation(value="发布公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/releaseNotice")
+    public Map<String, Object> releaseNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.releaseNotice(map);
+    }
+
     @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
     @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
@@ -1677,6 +1684,12 @@ public class AMScontroller{
         return amsFeign.updateNotice(map);
     }
 
+
+    @PostMapping(value = "/updateNoticeStatus", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.updateNoticeStatus(map);
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
@@ -1684,7 +1697,12 @@ public class AMScontroller{
         return amsFeign.deleteNotice(id);
     }
 
-
+    @ApiOperation(value="获取名字", notes="根据url的id来获取对象名字")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @PostMapping(value = "/queryName/{userId}")//BigDecimal
+    public Map<String, Object> queryName(@PathVariable("userId") String userId) {
+        return amsFeign.queryName(userId);
+    }
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")

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

@@ -776,6 +776,14 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.getShipFeeStatement(map);
     }
 
+    @PostMapping("/getShipFeeStatemented")
+    public Map<String,Object> getShipFeeStatemented(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.getShipFeeStatemented(map);
+    }
+
     @PostMapping("/addShipFeeStatement")
     public Map<String,Object> addShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
         if(map == null){

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

@@ -1469,14 +1469,27 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/dilnotices/insertNotice")
     Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
 
+    //发布公告
+    @PostMapping(value = "api/v1/ams/dilnotices/releaseNotice")
+    Map<String,Object> releaseNotice(@RequestBody(required = false) Map<String,Object> map);
+
     //删除公告
     @PostMapping(value = "api/v1/ams/dilnotices/deleteNotice/{id}")
     Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
 
+
+    //获取公告名字
+    @PostMapping(value = "api/v1/ams/dilnotices/queryName/{userId}")
+    Map<String, Object> queryName(@PathVariable("userId") String userId);
+
     //更新公告
     @PostMapping(value = "api/v1/ams/dilnotices/updateNotice")
     Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
 
+    //根据用户ID更新状态
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNoticeStatus")
+    Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
+
     //根据id获取公告
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);

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

@@ -317,6 +317,9 @@ public interface BmsshipFeign {
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatement")
     Map<String, Object> getShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatemented")
+    Map<String, Object> getShipFeeStatemented(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addShipFeeStatement")
     Map<String, Object> addShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);