|
@@ -18,6 +18,7 @@ import com.xy.entity.DeviceEventMsg;
|
|
|
import com.xy.entity.DeviceInfo;
|
|
|
import com.xy.entity.SysCodeConfigureRedis;
|
|
|
import com.xy.enums.ChannelType;
|
|
|
+import com.xy.enums.MsgConfigId;
|
|
|
import com.xy.enums.MsgType;
|
|
|
import com.xy.service.be.MercFeignService;
|
|
|
import com.xy.utils.R;
|
|
@@ -96,7 +97,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
|
|
|
boolean expPush2Merc = SysCodeConfigureUtils.getExpPush2Merc(expand);
|
|
|
//是否推送时间段
|
|
|
boolean expCanPush = SysCodeConfigureUtils.getExpCanPush(expand);
|
|
|
- Long configId = 12L;
|
|
|
+ Long configId = MsgConfigId.DEVICE_EXCEPTION.getId();
|
|
|
MsgConfigDto.Vo msgConfig = R.feignCheckData(msgSendApiService.getMsgConfig(new MsgConfigDto.Vo().setId(configId)));
|
|
|
List<MsgConfigTestDto.BizParam> bizParams = R.feignCheckData(msgSendApiService.getBizParamByMsgConfig(new MsgConfigTestDto.MsgConfig().setConfigId(configId)));
|
|
|
if (CollUtil.isNotEmpty(bizParams) && msgConfig != null) {
|