Jelajahi Sumber

修改app消息通知告警值显示

xujie 1 tahun lalu
induk
melakukan
a748ac0839

+ 7 - 1
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/notice/service/impl/WebsocketNoticeLogServiceImpl.java

@@ -141,7 +141,13 @@ public class WebsocketNoticeLogServiceImpl extends ServiceImpl<WebsocketNoticeLo
                     noticeVo.setIotAlarmDataId(iotAlarmData.getId());
                     noticeVo.setAlarmTime(iotAlarmData.getTime());
                     noticeVo.setAlarmContent(iotAlarmData.getContent());
-                    noticeVo.setAlarmValue(iotAlarmData.getAlarmValue());
+
+                    if (ObjectUtil.equal(iotAlarmData.getSourceType(), "FSU_TemperatureAndHumidity")){
+                        noticeVo.setAlarmValue(iotAlarmData.getAlarmValue());
+                    }else {
+                        noticeVo.setAlarmValue(iotAlarmData.getValueText());
+                    }
+
                     noticeVo.setDeviceName(deviceInfo.getDeviceName());
                     noticeVo.setProductType(deviceInfo.getDeviceProduct());
                     String productTypeName = ObjectUtil.isNotEmpty(BaseDeviceTypeEnum.getDescByCode(deviceInfo.getDeviceType()))