Commit 79eaa2d9 authored by 张森's avatar 张森

预警阈值相关 单位问题处理

parent 624463f7
package com.yeejoin.equipmanage.service.impl; package com.yeejoin.equipmanage.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex; import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
...@@ -76,7 +78,7 @@ public class MqttWarningReceiveServiceImpl implements MqttWaringReceiveService { ...@@ -76,7 +78,7 @@ public class MqttWarningReceiveServiceImpl implements MqttWaringReceiveService {
List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService
.getEquipmentSpeIndexBySpeIotCode(messageObj.get("iot_code").toString()); .getEquipmentSpeIndexBySpeIotCode(messageObj.get("iot_code").toString());
List<EquipmentSpecificIndex> collect = indexList.stream().filter(item -> !ObjectUtils.isEmpty(item.getNameKey()) && item.getNameKey().equalsIgnoreCase(messageObj.get(REALTIME_IOT_INDEX_KEY).toString())).collect(Collectors.toList()); List<EquipmentSpecificIndex> collect = indexList.stream().filter(item -> !ObjectUtils.isEmpty(item.getNameKey()) && item.getNameKey().equalsIgnoreCase(messageObj.get(REALTIME_IOT_INDEX_KEY).toString())).collect(Collectors.toList());
equipmentSpeIndex.setUnit(CollUtil.isNotEmpty(collect) ? collect.get(0).getUnit() : "m"); equipmentSpeIndex.setUnit(CollUtil.isNotEmpty(collect) && ObjectUtil.isNotEmpty(collect.get(0)) && StrUtil.isNotEmpty(collect.get(0).getUnit()) ? collect.get(0).getUnit() : "m");
isAlarmFlag(equipmentSpeIndex, iotDataVO); isAlarmFlag(equipmentSpeIndex, iotDataVO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment