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

feat 1001745

See merge request rays/pcloud-book!158

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/SendDefaultGuideMessageDTO.java

+package com.pcloud.book.group.dto;
+
+import com.pcloud.book.keywords.dto.KeywordDTO;
+import com.pcloud.book.keywords.dto.KeywordStatusDTO;
+import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class SendDefaultGuideMessageDTO {
+
+    private String groupName;
+
+    private String robotId;
+
+    private String weixinGroupId;
+
+    private Boolean isHaveKeywords;
+
+    private Boolean isGroupRobot;
+
+    private List<KeywordDTO> keywords;
+
+    private KeywordStatusDTO dto;
+
+    private GroupClassifyQrcodeDTO classifyQrcodeInfo;
+
+    private String ip;
+
+    private AccountSettingDto accountSettingDto;
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/SendGuideMessageDTO.java

+package com.pcloud.book.group.dto;
+
+import com.pcloud.book.keywords.dto.KeywordDTO;
+import com.pcloud.book.keywords.dto.KeywordStatusDTO;
+import com.pcloud.book.keywords.vo.ReplyMessageVO;
+import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class SendGuideMessageDTO {
+
+    private List<ReplyMessageVO> replyMessages;
+
+    private  String robotId;
+
+    private  String weixinGroupId;
+
+    private  Boolean isGroupRobot;
+
+    private  List<KeywordDTO> keywords;
+
+    private KeywordStatusDTO dto;
+
+    private  String ip;
+
+    private  Integer code;
+
+    private AccountSettingDto accountSettingDto;
+
+    private GroupClassifyQrcodeDTO classifyQrcodeInfo;
+
+}

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

@@ -17,6 +17,8 @@ import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
 import com.pcloud.book.group.dto.GroupQrcodeDTO;
 import com.pcloud.book.group.dto.JoinGroupCipherDTO;
 import com.pcloud.book.group.dto.PushAddUserMessageDTO;
+import com.pcloud.book.group.dto.SendDefaultGuideMessageDTO;
+import com.pcloud.book.group.dto.SendGuideMessageDTO;
 import com.pcloud.book.group.entity.AppTouchRecord;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.TouchTypeEnum;
@@ -375,17 +377,40 @@ public class BookGuideBizImpl implements BookGuideBiz {
         log.info("[wechatGroupConsr.isGroupRobot] robotId:{} groupRobot:{}", robotId, groupRobot);
         //如果设置了群学习报告，加一个群学习报告的关键词
         KeywordStatusDTO dto = pushLearningReport(classifyQrcodeInfo, robotId, weixinGroupId, pushAddUserMessageDTO.getIp());
+        AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(classifyQrcodeInfo.getChannelId());
         if (ListUtils.isEmpty(replyMessages)) {
             //获取群名称
             GroupQrcodeBaseInfoVO groupInfo = groupQrcodeBiz.getBaseById(classifyQrcodeInfo.getGroupQrcodeId());
             //推送消息 刘娜需求 1001282 群不推送关键词
             // 若非之前的机器人则不回复普通关键词
-            SendWeixinRequestTools.sendDefaultMessage(groupInfo == null ? "" : groupInfo.getGroupName(), robotId, weixinGroupId, isHaveKeywords, groupRobot, keywords, dto, pushAddUserMessageDTO.getIp());
+            SendDefaultGuideMessageDTO sendGuideMessageDTO = new SendDefaultGuideMessageDTO();
+            sendGuideMessageDTO.setClassifyQrcodeInfo(classifyQrcodeInfo);
+            sendGuideMessageDTO.setGroupName(groupInfo == null ? "" : groupInfo.getGroupName());
+            sendGuideMessageDTO.setRobotId(robotId);
+            sendGuideMessageDTO.setWeixinGroupId(weixinGroupId);
+            sendGuideMessageDTO.setIsHaveKeywords(isHaveKeywords);
+            sendGuideMessageDTO.setIsGroupRobot(groupRobot);
+            sendGuideMessageDTO.setKeywords(keywords);
+            sendGuideMessageDTO.setDto(dto);
+            sendGuideMessageDTO.setIp(pushAddUserMessageDTO.getIp());
+            sendGuideMessageDTO.setAccountSettingDto(accountSettingDto);
+            SendWeixinRequestTools.sendDefaultMessage(sendGuideMessageDTO);
         } else {
             //处理链接
             handleUrl(replyMessages, wechatInfo, classifyQrcodeInfo);
             //推送消息
-            SendWeixinRequestTools.sendGuideMessage(replyMessages, robotId, weixinGroupId, groupRobot, keywords, dto, pushAddUserMessageDTO.getIp(), SendMessageTypeEnum.GROUP.getCode());
+            SendGuideMessageDTO sendGuideMessageDTO = new SendGuideMessageDTO();
+            sendGuideMessageDTO.setClassifyQrcodeInfo(classifyQrcodeInfo);
+            sendGuideMessageDTO.setReplyMessages(replyMessages);
+            sendGuideMessageDTO.setRobotId(robotId);
+            sendGuideMessageDTO.setWeixinGroupId(weixinGroupId);
+            sendGuideMessageDTO.setIsGroupRobot(groupRobot);
+            sendGuideMessageDTO.setKeywords(keywords);
+            sendGuideMessageDTO.setDto(dto);
+            sendGuideMessageDTO.setIp(pushAddUserMessageDTO.getIp());
+            sendGuideMessageDTO.setCode(SendMessageTypeEnum.GROUP.getCode());
+            sendGuideMessageDTO.setAccountSettingDto(accountSettingDto);
+            SendWeixinRequestTools.sendGuideMessage(sendGuideMessageDTO);
             //新增欢迎语应用触发记录
             addGuideAppTouchRecord(replyMessages,weixinGroupId,classifyQrcodeInfo.getBookGroupId(),classifyQrcodeInfo.getClassifyId());
         }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dto/KeywordDTO.java

@@ -31,6 +31,23 @@ public class KeywordDTO implements Serializable {
     @ApiModelProperty("引导语")
     private String guide;
 
+    @ApiModelProperty("关键词应用/作品id")
+    private Long serveId;
+
+    @ApiModelProperty("应用/作品")
+    private String serveType;
+
+    @ApiModelProperty("关键词连接")
+    private String linkUrl;
+
+    @ApiModelProperty("关键词内容")
+    private String content;
+
+    @ApiModelProperty("关键词描述")
+    private String description;
+
+    @ApiModelProperty("回复类型")
+    private Integer replyType;
 
 
 }

pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml

@@ -133,17 +133,23 @@
         order by bk.rank ASC, bk.update_time desc, bk.id DESC
     </select>
 
-    <select id="listFiveKeyword" resultType="keywordDTO" parameterType="map">
+    <select id="listFiveKeyword" resultType="com.pcloud.book.keywords.dto.KeywordDTO" parameterType="map">
         SELECT
-        k.keywords,
-        k.id keywordId,
-        bk.is_warehouse as isWarehouse,
-        bk.warehouse_id as warehouseId,
-        k.guide
+            k.keywords,
+            k.id keywordId,
+            bk.is_warehouse as isWarehouse,
+            bk.warehouse_id as warehouseId,
+            k.guide,
+            k.content,
+            k.description,
+            k.link_url as linkUrl,
+            k.serve_id AS serveId,
+            k.serve_type AS serveType,
+            k.reply_type AS replyType
         FROM
-        book_keyword bk
+            book_keyword bk
         JOIN
-        keyword k ON bk.keyword_id = k.id
+            keyword k ON bk.keyword_id = k.id
         WHERE
         bk.is_delete = 0
         AND