|
@@ -291,12 +291,16 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
hasExpire = false;
|
|
|
|
|
|
} else {
|
|
|
- if ("period".equals(effectTime.getJSONObject("period").getString("type")) && "000000".equals(effectTime.getJSONObject("period").getString("startTime").substring(0, 6)) && "235959".equals(effectTime.getJSONObject("period").getString("endTime").substring(0, 6))) {
|
|
|
+ if ("period".equals(effectTime.getJSONObject("period").getString("type"))
|
|
|
+ && "000000".equals(effectTime.getJSONObject("period").getString("startTime").substring(0, 6))
|
|
|
+ && "235959".equals(effectTime.getJSONObject("period").getString("endTime").substring(0, 6))) {
|
|
|
//架构师w确认 00:00-23:59的生效时间为一值生效,23:59分不过期
|
|
|
hasExpire = false;
|
|
|
}
|
|
|
|
|
|
- if ("period".equals(effectTime.getString("type")) && effectTime.getJSONObject("period").getString("startTime").compareTo(DateUtils.getSdfTimeNotDate(dateTime)) <= 0 && effectTime.getJSONObject("period").getString("endTime").compareTo(DateUtils.getSdfTimeNotDate(dateTime)) >= 0) {
|
|
|
+ if ("period".equals(effectTime.getString("type"))
|
|
|
+ && effectTime.getJSONObject("period").getString("startTime").compareTo(DateUtils.getSdfTimeNotDate(dateTime)) <= 0
|
|
|
+ && effectTime.getJSONObject("period").getString("endTime").compareTo(DateUtils.getSdfTimeNotDate(dateTime)) >= 0) {
|
|
|
//在生效时间
|
|
|
inEffectTime = true;
|
|
|
} else {
|