|
|
@@ -6,6 +6,7 @@ import com.fdkankan.mqcontroller.entity.*;
|
|
|
import com.fdkankan.mqcontroller.mapper.IScenePlusMapper;
|
|
|
import com.fdkankan.mqcontroller.service.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -33,6 +34,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
|
ISceneProService sceneProService;
|
|
|
@Override
|
|
|
public Integer getQueueConfig(MqSendLog mqSendLog) {
|
|
|
+ if(StringUtils.isBlank(mqSendLog.getNum())){
|
|
|
+ return getDfId(mqSendLog.getType());
|
|
|
+ }
|
|
|
String num = mqSendLog.getNum();
|
|
|
ScenePlus scenePlus = this.getByNum(num);
|
|
|
ScenePro scenePro = sceneProService.getByNum(num);
|
|
|
@@ -65,6 +69,18 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
|
|
|
|
}
|
|
|
|
|
|
+ private Integer getDfId(String type){
|
|
|
+ List<MqQueueConfig> queueConfigList = queueConfigService.getByType(type);
|
|
|
+ if(queueConfigList.isEmpty()){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ List<MqQueueConfig> collect = queueConfigList.stream().filter(e -> e.getIsDefault() == 1).collect(Collectors.toList());
|
|
|
+ if(collect.isEmpty()){
|
|
|
+ return queueConfigList.get(0).getId();
|
|
|
+ }
|
|
|
+ return collect.get(0).getId();
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ScenePlus getByNum(String num) {
|
|
|
LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|