wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决流推送时，未推送结束标识

Browse Source
This commit is contained in:
wulin 2023-11-21 16:34:34 +08:00
parent dc65857564
commit 39a1a6681f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java
View File

@ -72,15 +72,20 @@ public abstract class ActionCommand {
Integer index){ Integer index){
if(baseSession.getRequestId().equals(queue.getRequestId())){ if(baseSession.getRequestId().equals(queue.getRequestId())){
Integer finish = YesNo.NO.getCode();
String message = ""; String message = "";
if(queue.getQueue().size() > 0){ if(queue.getQueue().size() > 0){
message = queue.getQueue().poll(); message = queue.getQueue().poll();
message = StringUtils.getSendStr(sb, message, false); message = StringUtils.getSendStr(sb, message, false);
}else if(queue.getStatus() == YesNo.NO.getCode().intValue()){ }else if(queue.getStatus() == YesNo.NO.getCode().intValue()){
finish = 1;
if(sb.length() == 0){ if(sb.length() == 0){
//结束了 //结束了
log.info("发送结束了，请求id：{}", queue.getRequestId()); log.info("发送结束了，请求id：{}", queue.getRequestId());
return normalSendMsg(baseSession, message, type, finish, actionSendMessage, index).flatMap(b -> {
return Mono.empty(); return Mono.empty();
});
} }
message = sb.toString(); message = sb.toString();
message = StringUtils.removeStringChars(message); message = StringUtils.removeStringChars(message);
@ -89,11 +94,11 @@ public abstract class ActionCommand {
try{ try{
Thread.sleep(10); Thread.sleep(10);
}catch(Exception e){ }catch(Exception e){
log.info("等信息信息休息异常{}", e); log.info("等信息休息异常{}", e);
} }
} }
if(StringUtils.isNotEmpty(message)){ if(StringUtils.isNotEmpty(message)){
return normalSendMsg(baseSession, message, type, YesNo.NO.getCode(), actionSendMessage, index).flatMap(m -> { return normalSendMsg(baseSession, message, type, finish, actionSendMessage, index).flatMap(m -> {
return sendMessage(action, baseSession, queue, sb, type, actionSendMessage, index + 1); return sendMessage(action, baseSession, queue, sb, type, actionSendMessage, index + 1);
}); });
} }