修改不过，告警名称

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

@@ -1877,7 +1877,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         EquipmentSpecificIndex equipmentSpecificIndex = collect.get(entry.getKey());
                         if (!ObjectUtils.isEmpty(equipmentSpecificIndex)) {
                             IotIndexInfoVo iotIndexInfoVo = new IotIndexInfoVo();
-                            iotIndexInfoVo.setType(equipmentSpecificIndex.getIndexName());
+
+
+                            iotIndexInfoVo.setType(equipmentSpecificIndex.getTypeName()!=null?equipmentSpecificIndex.getTypeName(): equipmentSpecificIndex.getIndexName());
+
+
                             iotIndexInfoVo.setNumber(deviceName);
                             if (equipmentSpecificIndex.getIsTrend() == 1) {
                                 iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + entry.getValue() + equipmentSpecificIndex.getIndexUnitName());

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -456,7 +456,8 @@
         wei.is_trend isTrend,
         wesi.value_label,
         wesi.equipment_index_name,
-        wesi.update_date AS updateDate
+        wesi.update_date AS updateDate,
+        wei.type_name AS typeName
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id