yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://192.168.65.152:3000/Jone/hzims-back

zhongwei
liwen 8 months ago
parent
2dd91c8e0c 1af25cc19d
commit
fea2e728e2
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java
  2. 2
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java

4
hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java
Unescape View File

@ -65,7 +65,7 @@ public interface AlarmConstants {
String SMS_MESSAGE_TEMPLATE_CODE = "aliyun-alert-push"; String SMS_MESSAGE_TEMPLATE_CODE = "aliyun-alert-push";
String FDP_INVALID_STATUS = "0.0"; String FDP_INVALID_STATUS = "1.0";
String FDP_INVALID_ZOME_STATUS = "0"; String FDP_INVALID_ZOME_STATUS = "1";
} }

2
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
Unescape View File

@ -72,7 +72,7 @@ public class FdpAlarmServiceImpl implements FdpAlarmService {
if (ObjectUtils.isEmpty(alarms)) { if (ObjectUtils.isEmpty(alarms)) {
return new ArrayList<>(); return new ArrayList<>();
} }
if(FDP_INVALID_STATUS.equals(alarms.getStatus()) || FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){ if(!FDP_INVALID_STATUS.equals(alarms.getStatus()) && !FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){
return new ArrayList(); return new ArrayList();
} }
AlarmEntity entity = getAlarmEntity(alarms); AlarmEntity entity = getAlarmEntity(alarms);

Write Preview
Loading…
Cancel
Save