|
@@ -618,10 +618,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
status = scenePlus.getSceneStatus();
|
|
status = scenePlus.getSceneStatus();
|
|
}
|
|
}
|
|
HashMap<String, MqSendLog> mqSendLogHashMap = mqSendLogService.getByNumList(Arrays.asList(num));
|
|
HashMap<String, MqSendLog> mqSendLogHashMap = mqSendLogService.getByNumList(Arrays.asList(num));
|
|
|
|
+ String redisKey = "mq-wait:queue:num:"+num;
|
|
if(!mqSendLogHashMap.isEmpty()){
|
|
if(!mqSendLogHashMap.isEmpty()){
|
|
for (String key : mqSendLogHashMap.keySet()) {
|
|
for (String key : mqSendLogHashMap.keySet()) {
|
|
- mqSendLogService.removeById(mqSendLogHashMap.get(key).getId());
|
|
|
|
- status = -1;
|
|
|
|
|
|
+ if(!redisUtil.hasKey(redisKey)){
|
|
|
|
+ mqSendLogService.removeById(mqSendLogHashMap.get(key).getId());
|
|
|
|
+ status = -1;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(status != null && status == 0){
|
|
if(status != null && status == 0){
|