Merge branch 'mymaster' into 'master'

广告位修改

See merge request rays/pcloud-book!69

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/AdvertisingSpaceBiz.java

@@ -170,7 +170,7 @@ public interface AdvertisingSpaceBiz {
      * @return
      * @throws BizException
      */
-    PageBean list(String name, PageParam pageParam, Boolean filterClose, Boolean filterTest) throws BizException;
+    PageBean list(String name, PageParam pageParam, Boolean filterClose, Boolean filterTest, String adPosition) throws BizException;
 
     /**
      * 书刊广告位明细

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -1342,11 +1342,12 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
      * 获取广告位列表
      */
     @Override
-    public PageBean list(String name, PageParam pageParam, Boolean filterClose, Boolean filterTest) throws BizException {
+    public PageBean list(String name, PageParam pageParam, Boolean filterClose, Boolean filterTest, String adPosition) throws BizException {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("name", StringUtil.isEmpty(name) ? null : name);
         paramMap.put("filterClose", filterClose);
         paramMap.put("filterTest", filterTest);
+        paramMap.put("adPosition", adPosition);
         PageBean pageBean = advertisingSpaceDao.listPage(pageParam, paramMap, "list");
         if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
             return new PageBean(0, 0, new ArrayList<>());

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/AdvertisingSpaceFacade.java

@@ -297,13 +297,15 @@ public interface AdvertisingSpaceFacade {
             @ApiImplicitParam(name = "currentPage", value = "当前页", dataType = "int", paramType = "query"),
             @ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "int", paramType = "query"),
             @ApiImplicitParam(name = "filterClose", value = "过滤已关闭", dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "filterTest", value = "过滤测试数据", dataType = "int", paramType = "query")
+            @ApiImplicitParam(name = "filterTest", value = "过滤测试数据", dataType = "int", paramType = "query"),
+            @ApiImplicitParam(name = "adPosition", value = "广告位位置", dataType = "string", paramType = "query")
     })
     @RequestMapping(value = "list", method = RequestMethod.GET)
     ResponseDto<?> list(@RequestHeader("token") String token, @RequestParam(value = "name", required = false) String name,
                         @RequestParam(value = "currentPage", required = false) Integer currentPage, @RequestParam(value = "numPerPage", required = false) Integer numPerPage,
                         @RequestParam(value = "filterClose", required = false) Boolean filterClose,
-                        @RequestParam(value = "filterTest", required = false) Boolean filterTest)
+                        @RequestParam(value = "filterTest", required = false) Boolean filterTest,
+                        @RequestParam(value = "adPosition", required = false) String adPosition)
             throws PermissionException, BizException, JsonParseException;
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/impl/AdvertisingSpaceFacadeImpl.java

@@ -261,7 +261,8 @@ public class AdvertisingSpaceFacadeImpl implements AdvertisingSpaceFacade {
     public ResponseDto<?> list(@RequestHeader("token") String token, @RequestParam(value = "name", required = false) String name,
                                @RequestParam(value = "currentPage", required = false) Integer currentPage, @RequestParam(value = "numPerPage", required = false) Integer numPerPage,
                                @RequestParam(value = "filterClose", required = false) Boolean filterClose,
-                               @RequestParam(value = "filterTest", required = false) Boolean filterTest)
+                               @RequestParam(value = "filterTest", required = false) Boolean filterTest,
+                               @RequestParam(value = "adPosition", required = false) String adPosition)
             throws PermissionException, BizException, JsonParseException {
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
             throw BookBizException.PAGE_PARAM_DELETION;
@@ -272,7 +273,7 @@ public class AdvertisingSpaceFacadeImpl implements AdvertisingSpaceFacade {
         if (null == filterTest) {
             filterTest = true;
         }
-        return new ResponseDto<>(advertisingSpaceBiz.list(name, new PageParam(currentPage, numPerPage), filterClose, filterTest));
+        return new ResponseDto<>(advertisingSpaceBiz.list(name, new PageParam(currentPage, numPerPage), filterClose, filterTest, adPosition));
     }
 
     /**