Browse Source

历史报警错误逻辑修复

lixing 3 years ago
parent
commit
00697455b5

+ 1 - 1
dmp-alarm/src/main/java/com/persagy/dmp/alarm/service/AlarmRecordService.java

@@ -60,7 +60,7 @@ public class AlarmRecordService extends AlarmBaseService {
         // 如果查询历史报警,查询报警状态为“已恢复”和”已过期”的报警,或者【报警状态等于“未恢复”且报警处理状态等于“处理完成”】的报警
         if (EnumAlarmListType.HISTORY.name().equals(listType)) {
             BooleanExpression historyAlarmExpression = qAlarmRecord.state.eq(EnumAlarmState.END.getType())
-                    .or(qAlarmRecord.state.eq(EnumAlarmState.END.getType()))
+                    .or(qAlarmRecord.state.eq(EnumAlarmState.EXPIRE.getType()))
                     .or(qAlarmRecord.treatState.eq(EnumAlarmTreatState.DONE.getType()));
             expressions.add(historyAlarmExpression);
         }

+ 2 - 0
dmp-alarm/src/main/resources/bootstrap.yml

@@ -31,3 +31,5 @@ management:
   endpoint:
     health:
       enabled: true
+
+

+ 4 - 2
dmp-alarm/src/main/resources/logback-spring.xml

@@ -46,8 +46,10 @@
     </logger>
 
     <springProfile name="dev">
-        <logger name="org.hibernate.SQL" level="${LOG_LEVEL}"/>
-        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="${LOG_LEVEL}"/>
+<!--        <logger name="org.hibernate.SQL" level="${LOG_LEVEL}"/>-->
+<!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="${LOG_LEVEL}"/>-->
+        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="DEBUG"/>
         <root level="info">
             <appender-ref ref="stdout"/>
         </root>