Merge branch 'feature/1004024' into 'master'

feat: [1004024] 微信群被封处理-转企业微信个人号流程

See merge request rays/pcloud-book!1100

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/WxWorkKeyWordService.java

@@ -15,8 +15,8 @@ import java.util.List;
 @Api(description = "关键词内部接口")
 public interface WxWorkKeyWordService {
 
-    @ApiOperation("根据群分类ID获取关键词回复")
-    @GetMapping("/getKeyWordsByClassify")
-    ResponseEntity<ResponseDto<List<ReplyMsgDTO>>> getKeyWordsByClassify(@RequestParam("classifyId") Long classifyId);
+    @ApiOperation("根据bookGroupId获取关键词回复")
+    @GetMapping("/getKeyWordsByBookGroupId")
+    ResponseEntity<ResponseDto<List<ReplyMsgDTO>>> getKeyWordsByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId);
 
 }

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

@@ -718,6 +718,13 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     @ParamLog("客户端根据群分类获取二维码")
     public GroupQrcode4ClassifyVO getGroupQrcode4ClassifyWechat(Long classifyId, Long wechatUserId) {
 
+        // 临时替换为企业微信加好友流程
+        if (JedisClusterUtils.exists("WECHAT_GROUP_BAN_PROCESS") && Objects.isNull(classifyId)) {
+            GroupQrcode4ClassifyVO vo = new GroupQrcode4ClassifyVO();
+            vo.setQrcodeUrl(JedisClusterUtils.get("WECHAT_GROUP_BAN_PROCESS"));
+            return vo;
+        }
+
         //获取分类基本信息
         ClassifyVO classify = bookGroupClassifyDao.getClassify(classifyId);
         if (classify == null) {
@@ -736,14 +743,6 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
             }
         }
 
-        // 临时替换为企业微信加好友流程
-        if (JedisClusterUtils.exists("WECHAT_GROUP_BAN_PROCESS")) {
-            GroupQrcode4ClassifyVO vo = new GroupQrcode4ClassifyVO();
-            vo.setQrcodeUrl(JedisClusterUtils.get("WECHAT_GROUP_BAN_PROCESS"));
-            vo.setGroupName(classify.getClassify());
-            return vo;
-        }
-
         //获取用户是否分配过二维码
         GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookQrcodeUserDao.getUserQrcode(classifyId, wechatUserId);
         if (groupQrcode4ClassifyVO == null) {

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupClassifyFacade.java

@@ -149,7 +149,7 @@ public interface BookGroupClassifyFacade {
             @ApiImplicitParam(name = "classifyId", value = "分类标识", dataType = "Long", paramType = "query")
     })
     @GetMapping("getGroupQrcode4ClassifyWechat")
-    ResponseDto<GroupQrcode4ClassifyVO> getGroupQrcode4ClassifyWechat(@CookieValue("userInfo") String userInfo, @RequestParam("classifyId") Long classifyId);
+    ResponseDto<GroupQrcode4ClassifyVO> getGroupQrcode4ClassifyWechat(@CookieValue("userInfo") String userInfo, @RequestParam(value = "classifyId",required = false) Long classifyId);
 
     @ApiOperation(value = "小程序客户端根据群分类获取二维码", httpMethod = "GET")
     @RequestMapping(value = "getGroupQrcode4Applet", method = RequestMethod.GET)

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupClassifyFacadeImpl.java

@@ -157,7 +157,7 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
 
     @Override
     @GetMapping("getGroupQrcode4ClassifyWechat")
-    public ResponseDto<GroupQrcode4ClassifyVO> getGroupQrcode4ClassifyWechat(@CookieValue("userInfo") String userInfo, @RequestParam("classifyId") Long classifyId) {
+    public ResponseDto<GroupQrcode4ClassifyVO> getGroupQrcode4ClassifyWechat(@CookieValue("userInfo") String userInfo, @RequestParam(value = "classifyId",required = false) Long classifyId) {
         Long wechatUserId = Cookie.getId(userInfo, Cookie._WECHAT_USER_ID);
         GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookGroupClassifyBiz.getGroupQrcode4ClassifyWechat(classifyId, wechatUserId);
         return new ResponseDto<>(groupQrcode4ClassifyVO == null ? new GroupQrcode4ClassifyVO() : groupQrcode4ClassifyVO);

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

@@ -30,8 +30,8 @@ public class WxWorkKeyWordServiceImpl implements WxWorkKeyWordService {
 
 
     @Override
-    @GetMapping("/getKeyWordsByClassify")
-    public ResponseEntity<ResponseDto<List<ReplyMsgDTO>>> getKeyWordsByClassify(@RequestParam("classifyId") Long classifyId) {
-        return ResponseHandleUtil.toResponse(bookKeywordBiz.getKeyWordsByClassify(classifyId));
+    @GetMapping("/getKeyWordsByBookGroupId")
+    public ResponseEntity<ResponseDto<List<ReplyMsgDTO>>> getKeyWordsByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId) {
+        return ResponseHandleUtil.toResponse(bookKeywordBiz.getKeyWordsByBookGroupId(bookGroupId));
     }
 }

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

@@ -162,5 +162,5 @@ public interface BookKeywordBiz {
      */
     void robotWakeUp(String userWxId, String ip, Integer code, String robotId);
 
-    List<ReplyMsgDTO> getKeyWordsByClassify(Long classifyId);
+    List<ReplyMsgDTO> getKeyWordsByBookGroupId(Long bookGroupId);
 }

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

@@ -51,6 +51,7 @@ import com.pcloud.book.group.enums.UpdateStatusEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.group.vo.ClassifyNameVO;
 import com.pcloud.book.group.vo.ClassifyVO;
+import com.pcloud.book.group.vo.ListClassify4WechatVO;
 import com.pcloud.book.group.vo.ListClassifyVO;
 import com.pcloud.book.guide.dto.PcloudGuideDelayDto;
 import com.pcloud.book.guide.dto.WakeUpInfoDto;
@@ -2138,12 +2139,24 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
     }
 
     @Override
-    public List<ReplyMsgDTO> getKeyWordsByClassify(Long classifyId) {
+    public List<ReplyMsgDTO> getKeyWordsByBookGroupId(Long bookGroupId) {
+
+        //获取第一个群分类
+        Integer rankType = bookGroupBiz.getRankType(bookGroupId);
+        List<ListClassify4WechatVO> listClassify4WechatVOS = bookGroupClassifyDao.listClassify4Wechat(bookGroupId, rankType);
+        Long classifyId = null;
+
+        if (CollUtil.isEmpty(listClassify4WechatVOS)) {
+            return new ArrayList<>();
+        }
+
+        classifyId = listClassify4WechatVOS.get(0).getClassifyId();
+
         ClassifyDTO classifyDTO = bookGroupClassifyDao.getById(classifyId);
         if (Objects.isNull(classifyDTO) || Objects.isNull(classifyDTO.getBookGroupId())) {
             return new ArrayList<>();
         }
-        Long bookGroupId = classifyDTO.getBookGroupId();
+
         // 获取所有的关键词
         List<ReplyKeywordDTO> replyKeywordDTOS = bookKeywordDao.listAllKeywordByClassifyIdAndBookGroupId(classifyId, bookGroupId);
         if (CollUtil.isEmpty(replyKeywordDTOS)) {