|
|
@@ -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()))
|