修复warning_level判断问题

pipe-network-service/zksy-system/src/main/java/com/zksy/base/alarm/service/AlarmOperationsService.java

@@ -4,18 +4,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.alarm.domain.AlarmLog;
 import com.zksy.base.alarm.dto.*;
 import com.zksy.base.alarm.enums.*;
-import com.zksy.base.alarm.enums.AlarmLogOperTypeEnum;
-import com.zksy.base.alarm.mapper.*;
-import com.zksy.base.enums.EquipmentTypeEnum;
+import com.zksy.base.alarm.mapper.AlarmLogMapper;
+import com.zksy.base.alarm.mapper.AlarmOperationsMapper;
 import com.zksy.base.enums.AlarmStatusEnum;
-import com.zksy.common.exception.ServiceException;
+import com.zksy.base.enums.EquipmentTypeEnum;
 import com.zksy.common.core.domain.entity.SysDictData;
-import com.zksy.system.service.ISysDictDataService;
+import com.zksy.common.exception.ServiceException;
 import com.zksy.ops.enums.WorkOrderStatusEnum;
+import com.zksy.system.service.ISysDictDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
+import org.springframework.util.StringUtils;
+
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -201,7 +203,7 @@ public class AlarmOperationsService {
     }
     private void validate(AlarmQuery query) {
         if (query.getPageNum() < 1 || query.getPageSize() < 1 || query.getPageSize() > 100) throw new ServiceException("分页参数无效");
-        if (query.getAlarmLevel() != null && alarmLevels().stream().noneMatch(v -> v.getDictValue().equals(query.getAlarmLevel()))) throw new ServiceException("报警等级无效");
+        if (StringUtils.hasText(query.getAlarmLevel()) && alarmLevels().stream().noneMatch(v -> v.getDictValue().equals(query.getAlarmLevel()))) throw new ServiceException("报警等级无效");
         if (query.getAuditStatus() != null && AlarmAuditStatusEnum.fromCode(query.getAuditStatus()) == null) throw new ServiceException("审核结果无效");
         if (query.getAlarmStatus() != null && AlarmRecordStatusEnum.fromCode(query.getAlarmStatus()) == null) throw new ServiceException("监测状态无效");
         if (query.getDisplayStatus() != null && (query.getDisplayStatus() < 1 || query.getDisplayStatus() > 4)) throw new ServiceException("报警展示状态无效");

pipe-network-service/zksy-system/src/main/java/com/zksy/base/alarm/service/AlarmReviewService.java

@@ -19,6 +19,8 @@ import com.zksy.ops.service.WorkOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -154,7 +156,7 @@ public class AlarmReviewService {
     private void validate(AlarmReviewQuery query) {
         if (query.getPageNum() < 1 || query.getPageSize() < 1 || query.getPageSize() > 100)
             throw new ServiceException("分页参数无效");
-        if (query.getAlarmLevel() != null && alarmLevels().stream().noneMatch(v -> v.getDictValue().equals(query.getAlarmLevel())))
+        if (StringUtils.hasText(query.getAlarmLevel()) && alarmLevels().stream().noneMatch(v -> v.getDictValue().equals(query.getAlarmLevel())))
             throw new ServiceException("报警等级无效");
         if (query.getAuditStatus() != null && AlarmAuditStatusEnum.fromCode(query.getAuditStatus()) == null)
             throw new ServiceException("审核结果无效");

pipe-network-service/zksy-system/src/main/resources/mapper/base/AlarmOperationsMapper.xml

@@ -32,7 +32,7 @@
                     OR e.equipment_name ILIKE CONCAT('%',#{query.keyword},'%')
                     OR a.alarm_no ILIKE CONCAT('%',#{query.keyword},'%'))
             </if>
-            <if test="query.alarmLevel != null">AND a.alarm_level = #{query.alarmLevel}</if>
+            <if test="query.alarmLevel != null and query.alarmLevel != ''">AND a.alarm_level = #{query.alarmLevel}</if>
             <if test="query.auditStatus != null">AND a.audit_status = #{query.auditStatus}</if>
             <if test="query.startTime != null">AND a.create_time &gt;= #{query.startTime}</if>
             <if test="query.endTime != null">AND a.create_time &lt; #{query.endTime}</if>
@@ -76,7 +76,7 @@
         <if test="query.displayStatus != null">AND (CASE WHEN a.audit_status = 2 THEN 4 WHEN a.alarm_status = 1 THEN 3 WHEN a.work_order_id IS NOT NULL THEN 2 ELSE 1 END) = #{query.displayStatus}</if>
         <if test="query.actualValueOnly">AND a.actual_value IS NOT NULL</if>
         <if test="query.auditStatus != null">AND a.audit_status = #{query.auditStatus}</if>
-        <if test="query.alarmLevel != null">AND a.alarm_level = #{query.alarmLevel}</if>
+        <if test="query.alarmLevel != null and query.alarmLevel != ''">AND a.alarm_level = #{query.alarmLevel}</if>
         <if test="query.startTime != null">AND a.create_time &gt;= #{query.startTime}</if>
         <if test="query.endTime != null">AND a.create_time &lt;= #{query.endTime}</if>
     </sql>

pipe-network-service/zksy-system/src/main/resources/mapper/base/AlarmReviewMapper.xml

@@ -26,7 +26,7 @@
                 OR EXISTS (SELECT 1 FROM app_user.equipment_base e WHERE e.equipment_code = a.device_code
                     AND e.equipment_name ILIKE CONCAT('%', #{query.keyword}, '%')))
         </if>
-        <if test="query.alarmLevel != null">AND a.alarm_level = #{query.alarmLevel}</if>
+        <if test="query.alarmLevel != null and query.alarmLevel != ''">AND a.alarm_level = #{query.alarmLevel}</if>
         <if test="query.startTime != null">AND a.create_time &gt;= #{query.startTime}</if>
         <if test="query.endTime != null">AND a.create_time &lt;= #{query.endTime}</if>
     </sql>