Merge branch 'zyj-1002283' into 'master'

1002283

See merge request rays/pcloud-book!358

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -617,6 +617,10 @@ public class BookDto extends BaseDto {
      * 是否已下印
      */
     private Boolean isPrint;
+    /**
+     * 是否配置了个人号关键词
+     */
+    private Boolean hasRobotKeyword;
 
     public String getQrRemark() {
         return qrRemark;
@@ -1646,6 +1650,14 @@ public class BookDto extends BaseDto {
         this.isPrint = isPrint;
     }
 
+    public Boolean getHasRobotKeyword() {
+        return hasRobotKeyword;
+    }
+
+    public void setHasRobotKeyword(Boolean hasRobotKeyword) {
+        this.hasRobotKeyword = hasRobotKeyword;
+    }
+
     @Override
     public String toString() {
         return "BookDto{" +
@@ -1769,6 +1781,8 @@ public class BookDto extends BaseDto {
                 ", areaLabelId=" + areaLabelId +
                 ", agentIncome=" + agentIncome +
                 ", adviserIncome=" + adviserIncome +
-                "} " + super.toString();
+                ", isPrint=" + isPrint +
+                ", hasRobotKeyword=" + hasRobotKeyword +
+                '}';
     }
 }

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

@@ -100,6 +100,7 @@ import com.pcloud.book.group.vo.UserBookInfoItemVO;
 import com.pcloud.book.group.vo.UserBookInfoVO;
 import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.keywords.biz.BookKeywordBiz;
+import com.pcloud.book.keywords.biz.SelfRobotKeywordBiz;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.dto.KeywordDTO;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
@@ -314,6 +315,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
     private ResourceConsr resourceConsr;
     @Autowired
     private ReadingUserDao readingUserDao;
+    @Autowired
+    private SelfRobotKeywordBiz selfRobotKeywordBiz;
 
     private static final ThreadPoolExecutor PLATFORM_STATISTICS_EXPORT_THREAD = new ThreadPoolExecutor(2, 2,
             0, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
@@ -865,6 +868,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
             //好友数量
             Integer friendsCount = bookGroupCipherUserDao.getFriendsCountByBookGroup(bookGroupId);
             bookDto.setFriendsCount(friendsCount);
+            Boolean hasRobotKeyword = selfRobotKeywordBiz.hasKeyword(bookGroupId);
+            bookDto.setHasRobotKeyword(hasRobotKeyword);
         }
         return pageBean;
     }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/SelfRobotKeywordBiz.java

@@ -43,4 +43,8 @@ public interface SelfRobotKeywordBiz {
     PageBeanNew<SelfRobotBookRecordDTO> getSelfRobotBookRecordList(Integer currentPage, Integer numPerPage);
 
     void exportSelfRobotBookRecord(Long partyId);
+
+    Boolean hasKeyword (Long bookGroupId);
+
+    SelfRobotKeyword getById(Long id);
 }

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

@@ -545,6 +545,26 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
         return list;
     }
 
+    @Override
+    public Boolean hasKeyword(Long bookGroupId) {
+        List<SelfRobotKeyword> list = selfRobotKeywordDao.getListByBookGroupId(bookGroupId);
+        if (ListUtils.isEmpty(list)){
+            return false;
+        }else {
+            return true;
+        }
+    }
+
+    @Override
+    public SelfRobotKeyword getById(Long id) {
+        SelfRobotKeyword keyword = selfRobotKeywordDao.getById(id);
+        if (null == keyword){
+            return new SelfRobotKeyword();
+        }
+        fillSelfRobotKeyword(Arrays.asList(keyword));
+        return keyword;
+    }
+
     @ParamLog("填充列表")
     private void fillSelfRobotKeyword(List<SelfRobotKeyword> selfRobotKeywords) {
         if (ListUtils.isEmpty(selfRobotKeywords)){

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/SelfRobotKeywordFacade.java

@@ -133,4 +133,8 @@ public interface SelfRobotKeywordFacade {
     @ApiOperation("书刊信息收录导出")
     @GetMapping("exportSelfRobotBookRecord")
     ResponseDto<?> exportSelfRobotBookRecord(@RequestHeader("token") String token) throws BizException, PermissionException;
+
+    @ApiOperation("getById")
+    @GetMapping("getById")
+    ResponseDto<?> getById(String token, Long id);
 }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/impl/SelfRobotKeywordFacadeImpl.java

@@ -199,4 +199,11 @@ public class SelfRobotKeywordFacadeImpl implements SelfRobotKeywordFacade {
         selfRobotKeywordBiz.exportSelfRobotBookRecord(partyId);
         return new ResponseDto<>();
     }
+    @Override
+    @GetMapping("getById")
+    public ResponseDto<?> getById(@RequestHeader("token") String token, @RequestParam("id") Long id) {
+        return new ResponseDto<>(selfRobotKeywordBiz.getById(id));
+    }
+
+
 }