Merge branch 'feat-dw-1002819' into 'master'

feat 1002819

See merge request rays/pcloud-book!675

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -623,7 +623,8 @@ public interface BookBiz {
 	/**
 	 * 获取编辑书刊H5
 	 */
-	PageBeanNew<BookDto> getAdviserBooks4H5(String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage);
+	PageBeanNew<BookDto> getAdviserBooks4H5(String grayStatus, String keyword, Long templetId, Long secondTempletId, Integer currentPage,
+											Integer numPerPage);
 
 	/**
 	 *运营端获取书刊及配置资源

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

@@ -1964,8 +1964,10 @@ public class BookBizImpl implements BookBiz {
 
     @ParamLog("获取编辑书刊H5")
     @Override
-    public PageBeanNew<BookDto> getAdviserBooks4H5(String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage) {
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4ES(keyword, templetId, secondTempletId, currentPage, numPerPage);
+    public PageBeanNew<BookDto> getAdviserBooks4H5(String grayStatus, String keyword, Long templetId, Long secondTempletId,
+                                                   Integer currentPage, Integer numPerPage) {
+        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4ES(StringUtils.isEmpty(grayStatus) ? "0" : grayStatus,keyword
+                , templetId, secondTempletId, currentPage, numPerPage);
         List<ESBookAndAdviser> esBookAndAdvisers=esPage.getContent();
         if (ListUtils.isEmpty(esBookAndAdvisers)){
             return new PageBeanNew<>();

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -695,6 +695,7 @@ public interface BookFacade {
     @ApiOperation("获取书刊列表H5")
     @GetMapping("getAdviserBooks4H5")
     ResponseDto<?> getAdviserBooks4H5(
+            @RequestHeader(value = "Gray-Status") String grayStatus,
             @RequestParam(value = "keyword", required = false) String keyword,
             @RequestParam(value = "templetId", required = false) Long templetId,
             @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/ESBookAndAdviserBiz.java

@@ -15,6 +15,6 @@ public interface ESBookAndAdviserBiz {
 
     void updateBookAndAdviserToES(List<Long> bookIds);
 
-    Page<ESBookAndAdviser> getAdviserBooks4ES(String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage);
+    Page<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage);
 
 }

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/ESBookAndAdviserBizImpl.java

@@ -5,6 +5,8 @@ import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
 import com.pcloud.book.es.repository.BookAndAdviserRepository;
 import com.pcloud.book.util.common.ThreadPoolUtils;
+import com.pcloud.book.util.common.YesOrNoEnums;
+import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
@@ -85,7 +87,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getAdviserBooks4ES(String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage) {
+    public Page<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Integer currentPage, Integer numPerPage) {
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery()
                 .filter(QueryBuilders.termQuery("isBookDelete", 0))
                 .filter(Objects.isNull(templetId) ? QueryBuilders.boolQuery() : QueryBuilders.termQuery("templetId", templetId))
@@ -96,8 +98,22 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
         BoolQueryBuilder should1 = QueryBuilders.boolQuery()
                 .should(QueryBuilders.termQuery("isBookAdviserDelete", 0))
                 .should(QueryBuilders.termQuery("isAdviserBook", 0));
+        // 审核通过之后屏蔽掉测试编辑的书刊
+        BoolQueryBuilder adviserIdBuilder = QueryBuilders.boolQuery();
+        if (YesOrNoEnums.YES.getCode().equals(grayStatus)) {
+            if ("test".equalsIgnoreCase(BookProps.getSystemEnv())) {
+                adviserIdBuilder = QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery("adviserId", 1404));
+            }
+            if ("uat".equalsIgnoreCase(BookProps.getSystemEnv())) {
+                adviserIdBuilder = QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery("adviserId", 12829));
+            }
+            if ("pro".equalsIgnoreCase(BookProps.getSystemEnv())) {
+                adviserIdBuilder = QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery("adviserId", 1362));
+            }
+        }
         boolQueryBuilder.must(should);
         boolQueryBuilder.must(should1);
+        boolQueryBuilder.must(adviserIdBuilder);
         Sort sort=new Sort(Sort.Direction.DESC, "isAdviserBook","lastModifiedDate", "bookId");
         PageRequest pageRequest = new PageRequest(currentPage, numPerPage,sort);
         Page<ESBookAndAdviser> search = bookAndAdviserRepository.search(boolQueryBuilder, pageRequest);

pcloud-service-book/src/main/java/com/pcloud/book/es/facade/ESBookAndAdviserFacade.java

@@ -48,7 +48,7 @@ public class ESBookAndAdviserFacade {
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
             throw BookBizException.PAGE_PARAM_DELETION;
         }
-        return esBookAndAdviserBiz.getAdviserBooks4ES(keyword,templetId,secondTempletId,currentPage,numPerPage).getContent();
+        return esBookAndAdviserBiz.getAdviserBooks4ES("0", keyword,templetId,secondTempletId,currentPage,numPerPage).getContent();
     }
 
 }

pcloud-service-book/src/main/java/com/pcloud/book/util/common/YesOrNoEnums.java

@@ -9,19 +9,25 @@ public enum  YesOrNoEnums {
     /**
      * 是
      */
-    YES(1),
+    YES(1, "1"),
     /**
      * 否
      */
-    NO(0);
+    NO(0, "0");
 
     private Integer value;
+    private String code;
 
-    YesOrNoEnums(Integer value) {
+    YesOrNoEnums(Integer value, String code) {
         this.value = value;
+        this.code = code;
     }
 
     public Integer getValue() {
         return value;
     }
+
+    public String getCode() {
+        return code;
+    }
 }