系统消息

device-api-service/src/main/java/com/xy/consumer/device/push/msg/DevicePushMsgConsumer.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.xy.consumer.MqttConsumer;
+import com.xy.dto.MsgConfigDto;
 import com.xy.dto.MsgConfigTestDto;
 import com.xy.dto.MsgSysMonitorNoticeDto;
 import com.xy.dto.UserInfoDto;
@@ -50,9 +51,9 @@ public class DevicePushMsgConsumer implements MqttConsumer {
     private DeviceInfoServiceImpl deviceInfoService;
     private MercFeignService mercFeignService;
     private UserInfoService userInfoService;
-    private MsgUserMessageService msgUserMessageService;
     private MsgSysMonitorNoticeService msgSysMonitorNoticeService;
 
+
     @Override
     public boolean message(String topic, String payload) {
         log.info("-----设备故障消息推送-----:{}", payload);
@@ -64,9 +65,9 @@ public class DevicePushMsgConsumer implements MqttConsumer {
             String msg = deviceEventMsg.getMsg();
             SysCodeConfigureRedis sysCodeConfigureRedis = SysCodeConfigureUtils.get(deviceEventMsg.getCode());
             Long configId = 12L;
-
+            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)) {
+            if (CollUtil.isNotEmpty(bizParams) && msgConfig != null) {
                 List<MsgConfigTestDto.BizData> bizDataList = BeanUtil.copyToList(bizParams, MsgConfigTestDto.BizData.class);
                 List<MsgConfigTestDto.BizData> sendList = new ArrayList<>();
                 /**
@@ -113,7 +114,8 @@ public class DevicePushMsgConsumer implements MqttConsumer {
                     msgSys.setMsgType(MsgType.TYPE6.getCode()).setContent(sbMsg.toString())
                             .setPubTime(LocalDateTime.now()).setPubState(2)
                             .setSendTargets(name)
-                            .setPriority(1)
+                            .setPriority(msgConfig.getPriority())
+                            .setTitle(msgConfig.getTitle())
                             .setPubUserId(-1).setTitle(MsgType.TYPE6.getDescription());
                     msgSysMonitorNoticeService.save(msgSys);
                 });