Merge branch 'hzk' into 'master'

收发一体

See merge request rays/pcloud-book!51

pcloud-service-book/src/main/java/com/pcloud/book/clock/biz/BookClockKeywordBiz.java

@@ -27,7 +27,7 @@ public interface BookClockKeywordBiz {
      * @param userWxId
      * @return
      */
-    Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId, String wechatGroupId);
+    Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId, String wechatGroupId,String wxId);
 
     /**
      * 获取微信群某一动作动作关键词

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

@@ -154,7 +154,7 @@ public class BookClockKeywordBizImpl implements BookClockKeywordBiz {
      */
     @Override
     @ParamLog("为微信群打卡关键词，发送关键词信息")
-    public Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId,String wechatGroupId) {
+    public Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId,String wechatGroupId, String wxId) {
         //发送TOPIC进行相关操作
         Long originId = bookClockInfoDTO.getOriginId();
         String originType = bookClockInfoDTO.getOriginType();
@@ -170,10 +170,12 @@ public class BookClockKeywordBizImpl implements BookClockKeywordBiz {
         pushBookClockKeywordDTO.setClassifyId(bookClockInfoDTO.getClassifyId());
         pushBookClockKeywordDTO.setAdviserId(bookClockInfoDTO.getCreateUser());
         pushBookClockKeywordDTO.setBookClockInfoId(bookClockInfoDTO.getBookClockInfoId());
-        String robotId = wechatGroupConsr.getRobotIdByGroupId(wechatGroupId);
+        // 收发一体--20190716-HZK
+        //String robotId = wechatGroupConsr.getRobotIdByGroupId(wechatGroupId);
+        
         Long wechatUserId = readerConsr.getWechatUserId(userWxId, bookClockInfoDTO.getChannelId());
         pushBookClockKeywordDTO.setWechatUserId(wechatUserId);
-        pushBookClockKeywordDTO.setRobotId(robotId);
+        pushBookClockKeywordDTO.setRobotId(wxId);
         if(OriginTypeEnum.APP.value.equalsIgnoreCase(originType)){
             AppDto appDto = appConsr.getBaseById(originId);
             if(null == appDto){

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/WxGroupSendTextListener.java

@@ -58,7 +58,7 @@ public class WxGroupSendTextListener {
             if (!ListUtils.isEmpty(allRobotWxIds) && !allRobotWxIds.contains(wechatUserId) && !StringUtil.isEmpty(sendTextDTO.getTextContent())) {
                 BookClockInfoDTO bookClockInfoDTO = bookClockCheck.checkKeywordIsClock(sendTextDTO.getTextContent().trim(), sendTextDTO.getWechatGroupId());
                 if(null != bookClockInfoDTO){
-                    bookClockKeywordBiz.sendKeywordMessage(bookClockInfoDTO, wechatUserId,sendTextDTO.getWechatGroupId());
+                    bookClockKeywordBiz.sendKeywordMessage(bookClockInfoDTO, wechatUserId,sendTextDTO.getWechatGroupId(),sendTextDTO.getWxId());
                 }else{
                     final long l = System.currentTimeMillis();
                     bookKeywordBiz.sendKeywordMessage(sendTextDTO.getTextContent().trim(), sendTextDTO.getWechatGroupId(), wechatUserId, sendTextDTO.getWxId());