Merge branch 'fix-1021485' into 'master'

fix-1021485:熔断里面配置需求定制单替换符，客户端没有生效

See merge request rays/pcloud-book!507

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/PersonalStageBiz.java

@@ -53,7 +53,7 @@ public interface PersonalStageBiz {
 
     void sendNotKeywordReply(String robotId, String userWxId, String ip, Long personalStageId, Long personalStageUserId, String userSendContent, Integer sendMode, Integer notKeywordSendCount);
 
-    void sendNotKeywordFusingReply(String robotId, String userWxId, String ip, Long personalStageId,Long personalStageUserId);
+    void sendNotKeywordFusingReply(String robotId, String userWxId, String ip, Long personalStageId,Long personalStageUserId, Long paperId);
 
     String replaceProjectProgressUrl(String content, String robotId, String userWxId, Long personalStageUserId);
 

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageBizImpl.java

@@ -369,7 +369,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
                       ||PersonalStageUserStateEnum.FUSING.value.equals(last.getState())){
                     // 走熔断
                     LOGGER.info("走熔断");
-                    handleFusingReply(robotId,userWxId,ip,personalStage,last);
+                    handleFusingReply(robotId,userWxId,ip,personalStage,last, personalStage.getPaperId());
                 }else {
                     //走正常逻辑非关键词回复并且更新记录
                     if (PersonalStageUserStateEnum.NORMAL.value.equals(last.getState())
@@ -501,6 +501,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
         String robotId=wakeupDelayDTO.getRobotId();
         String userWxId=wakeupDelayDTO.getWxId();
         String ip=wakeupDelayDTO.getIp();
+        this.replacePaperUrl(replyItems, robotId, userWxId, personalStage.getPaperId());
         sendReplyItems(replyItems,robotId,userWxId,ip,wakeupDelayDTO.getPersonalStageUserId());
         //下一个延时
         List<PersonalStageWakeup> wakeups = personalStageWakeupDao.getListByPersonalStageId(personalStageId);
@@ -735,7 +736,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
 
     @ParamLog("非关键词熔断回复")
     @Override
-    public void sendNotKeywordFusingReply(String robotId, String userWxId, String ip, Long personalStageId, Long personalStageUserId) {
+    public void sendNotKeywordFusingReply(String robotId, String userWxId, String ip, Long personalStageId, Long personalStageUserId, Long paperId) {
         List<Long> ids = personalStageReplyDao.getIdsByRelevance(StageReplyRelevEnum.FUSING_NOT_KEYWORD.value, personalStageId);
         if (ListUtils.isEmpty(ids)) {
             return;
@@ -746,6 +747,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
         if (ListUtils.isEmpty(items)){
             return;
         }
+        this.replacePaperUrl(items, robotId, userWxId, paperId);
         sendReplyItems(items,robotId,userWxId,ip,personalStageUserId);
     }
 
@@ -795,7 +797,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
     }
 
     @ParamLog("处理熔断回复情况")
-    private void handleFusingReply(String robotId, String userWxId, String ip, PersonalStage personalStage, PersonalStageUser last) {
+    private void handleFusingReply(String robotId, String userWxId, String ip, PersonalStage personalStage, PersonalStageUser last, Long paperId) {
         if (!PersonalStageUserStateEnum.FUSING.value.equals(last.getState())) {
             // 置为熔断状态
             PersonalStageUser user = new PersonalStageUser();
@@ -818,7 +820,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
         if (!JedisClusterUtils.exists(key)) {
             // 发送熔断回复消息
             JedisClusterUtils.set(key, "true", 60);
-            sendNotKeywordFusingReply(robotId, userWxId, ip, personalStage.getId(), last.getId());
+            sendNotKeywordFusingReply(robotId, userWxId, ip, personalStage.getId(), last.getId(), paperId);
         }
     }