Merge branch 'feat-1002457' into 'master'

1002457	阶段配置跳转衔接语，熔断，唤醒语时间支持时分秒录入

See merge request rays/pcloud-book!467

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

@@ -452,7 +452,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
         }
         if (currentWakeup!=null&&i>0&&i<wakeups.size()){
             PersonalStageWakeup nextWakeup=wakeups.get(i);
-            Integer time=(nextWakeup.getToStageStartTime()-currentWakeup.getToStageStartTime())*60*1000;
+            Integer time=(nextWakeup.getToStageStartTime()-currentWakeup.getToStageStartTime())*1000;
             WakeupDelayDTO wakeupDelayDTONew=new WakeupDelayDTO();
             wakeupDelayDTONew.setPersonalStageWakeupId(nextWakeup.getId());
             wakeupDelayDTONew.setRobotId(robotId);
@@ -502,7 +502,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
         wakeupDelayDTO.setIp(ip);
         wakeupDelayDTO.setPersonalStageId(personalStageId);
         wakeupDelayDTO.setPersonalStageUserId(personalStageUser.getId());
-        DelayQueueDTO delayQueueDTO = DelayQueueDTO.builder().key(userWxId).type(PersonalStageConstant.PERSONALSTAGE_DELAY_WAKEUP).msg(wakeupDelayDTO).timeout(toStageStartTime*60*1000).build();
+        DelayQueueDTO delayQueueDTO = DelayQueueDTO.builder().key(userWxId).type(PersonalStageConstant.PERSONALSTAGE_DELAY_WAKEUP).msg(wakeupDelayDTO).timeout(toStageStartTime*1000).build();
         delayMessageSender.send(delayQueueDTO);
         return personalStageUser;
     }
@@ -598,7 +598,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
             delayDTO.setWxId(userWxId);
             delayDTO.setIp(ip);
             DelayQueueDTO delayQueueDTO = DelayQueueDTO.builder().key(userWxId).type(PersonalStageConstant.PERSONALSTAGE_DELAY_FUSING)
-                    .msg(delayDTO).timeout(personalStage.getNotKeywordFusingTime().intValue() * 60 * 1000).build();
+                    .msg(delayDTO).timeout(personalStage.getNotKeywordFusingTime().intValue() * 1000).build();
             delayMessageSender.send(delayQueueDTO);
         }
         String key = "BOOK:PERSONAL_STAGE:FUSING:" + last.getId();

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

@@ -430,7 +430,7 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
                 linkupDelayDTO.setWxId(userWxId);
                 linkupDelayDTO.setIp(ip);
                 linkupDelayDTO.setPersonalStageUserId(personalStageUserId);
-                DelayQueueDTO delayQueueDTO = DelayQueueDTO.builder().key(userWxId).type(PersonalStageConstant.PERSONALSTAGE_DELAY_LINKUP).msg(linkupDelayDTO).timeout(jumpLinkup.getToStageStartTime()*60*1000).build();
+                DelayQueueDTO delayQueueDTO = DelayQueueDTO.builder().key(userWxId).type(PersonalStageConstant.PERSONALSTAGE_DELAY_LINKUP).msg(linkupDelayDTO).timeout(jumpLinkup.getToStageStartTime()*1000).build();
                 delayMessageSender.send(delayQueueDTO);
                 LOGGER.info("增加跳转衔接语延时"+delayQueueDTO.toString());
             }else {

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/entity/PersonalStage.java

@@ -18,7 +18,7 @@ public class PersonalStage extends BaseEntity {
     @ApiModelProperty("发送阶段非关键词回复语次数")
     private Integer notKeywordFusingCount;
 
-    @ApiModelProperty("触发熔断后几分钟恢复正常")
+    @ApiModelProperty("触发熔断后几秒恢复正常")
     private Long notKeywordFusingTime;
 
     @ApiModelProperty("机器人分类id")