修改bug

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

@@ -690,6 +690,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
+        queryWrapper.isNull(EquipmentSpecificAlarmLog::getConfirmType);
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
         if(!logs.isEmpty()){
             EquipmentSpecificAlarmLog log = logs.get(0);

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

@@ -1249,7 +1249,7 @@
         LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wles.system_id )
         <where>
             DATE_SUB( CURDATE( ), INTERVAL 7 DAY ) &lt;= date( wlesa.create_date )
-            AND wlesa.equipment_specific_index_value = 'true'
+--             AND wlesa.equipment_specific_index_value = 'true'
             <if test="systemCode != null and systemCode != ''">
                 AND fs.code = #{systemCode}
             </if>