设备实时数据推送相关代码优化

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

@@ -8,15 +8,17 @@
         wcp.value AS value,
         wcp.remark AS remark,
         wcp.equipment_index_id AS equipmentIndexId,
-        wei.name_key AS nameKey
+        wei.name_key AS nameKey,
+        wcp.is_alarm as isAlarm,
+		wcp.emergency_level_color as emergencyLevelColor,
+		wcp.emergency_level as emergencyLevel,
+		wcp.emergency_level_describe as emergencyLevelDescribe
         FROM
         wl_car_property wcp
         LEFT JOIN wl_car AS wc ON wc.id = wcp.car_id
         LEFT JOIN wl_equipment_index AS wei ON wei.id = wcp.equipment_index_id
         WHERE
-        wc.iot_code = #{iotCode}
-        AND
-        TRIM(wei.name_key) != '' AND wei.name_key IS NOT NULL
+        wc.iot_code = #{iotCode} and  wei.is_iot = true
     </select>
     <select id="getCarPropertyList" resultType="com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo">
         SELECT

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

@@ -68,7 +68,7 @@
         LEFT JOIN wl_equipment_detail ed ON ed.id = wes.equipment_detail_id
         LEFT JOIN wl_equipment_index AS wei ON wei.id = wesi.equipment_index_id
         WHERE
-        wes.iot_code = #{iotCode}
+        wes.iot_code = #{iotCode}  and wei.is_iot = true
     </select>
 
     <select id="getEquipmentSpeIndexByIotCode"