单位问题处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -1627,8 +1627,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(indexKey);
             bizMessage.setIndexValue(String.valueOf(divide));
-            String message = "当前值为%s米，%s报警阈值%s";
-            String format = String.format(message, nowValue, messageLevel, "≥10%");
+            String message = "当前值为%s%s，%s报警阈值%s";
+            String format = String.format(message, nowValue, equipmentSpecificIndex.getUnit(), messageLevel, "≥10%");
             RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source, format);
             riskBizInfoVo.setWarningObjectCode(businessId);
             riskBizInfoVo.getDynamicDetails().get(0).setTabContent(tableContentVos);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttWarningReceiveServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.vo.IotDataVO;
 import com.yeejoin.equipmanage.common.vo.TopicEntityVo;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexService;
 import com.yeejoin.equipmanage.service.MqttWaringReceiveService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -49,6 +54,8 @@ public class MqttWarningReceiveServiceImpl implements MqttWaringReceiveService {
     @Autowired
     MqttReceiveServiceImpl mqttReceiveService;
 
+    @Autowired
+    IEquipmentSpecificIndexService equipmentSpecificIndexService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -66,6 +73,10 @@ public class MqttWarningReceiveServiceImpl implements MqttWaringReceiveService {
             equipmentSpeIndex.setBizOrgCode(messageObj.get("biz_org_code").toString());
             equipmentSpeIndex.setBizOrgName(messageObj.get("biz_org_name").toString());
             equipmentSpeIndex.setIotCode(messageObj.get("iot_code").toString());
+            List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService
+                    .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());
+            equipmentSpeIndex.setUnit(CollUtil.isNotEmpty(collect) ? collect.get(0).getUnit() : "m");
             isAlarmFlag(equipmentSpeIndex, iotDataVO);
         } catch (Exception e) {
             e.printStackTrace();