Merge branch 'hzk' into 'master'

格式化

See merge request rays/pcloud-book!52

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,String wxId);
+    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,8 @@ public class BookClockKeywordBizImpl implements BookClockKeywordBiz {
      */
     @Override
     @ParamLog("为微信群打卡关键词，发送关键词信息")
-    public Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId,String wechatGroupId, String wxId) {
+    public Boolean sendKeywordMessage(BookClockInfoDTO bookClockInfoDTO, String userWxId, String wechatGroupId,
+            String wxId) {
         //发送TOPIC进行相关操作
         Long originId = bookClockInfoDTO.getOriginId();
         String originType = bookClockInfoDTO.getOriginType();

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

@@ -58,7 +58,9 @@ 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(),sendTextDTO.getWxId());
+                    bookClockKeywordBiz
+                            .sendKeywordMessage(bookClockInfoDTO, wechatUserId, sendTextDTO.getWechatGroupId(),
+                                    sendTextDTO.getWxId());
                 }else{
                     final long l = System.currentTimeMillis();
                     bookKeywordBiz.sendKeywordMessage(sendTextDTO.getTextContent().trim(), sendTextDTO.getWechatGroupId(), wechatUserId, sendTextDTO.getWxId());