diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/dto/FilterRuleDetailDTO.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/dto/FilterRuleDetailDTO.java index 802f038..6549d8a 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/dto/FilterRuleDetailDTO.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/dto/FilterRuleDetailDTO.java @@ -7,6 +7,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Objects; /** * 过滤规则详情表 @@ -51,6 +52,9 @@ public class FilterRuleDetailDTO implements Serializable { * 是否为整点时间 */ public Boolean getOnTime(){ + if(Objects.isNull(dataType)){ + return false; + } return DataType.isRange(dataType); } } \ No newline at end of file diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/enumeration/DataType.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/enumeration/DataType.java index 7b3ff16..207715f 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/enumeration/DataType.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/enumeration/DataType.java @@ -3,6 +3,8 @@ package com.thing.filter.rule.enumeration; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * @author siyang * @date 2024-03-21 @@ -25,6 +27,9 @@ public enum DataType { } public static boolean isRange(int code) { - return code == 3; + if(Objects.equals(code, 3)){ + return true; + } + return false; } } diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java index 9331edd..87c9ee1 100644 --- a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java @@ -208,8 +208,8 @@ public class IotThingDictServiceImpl extends BaseServiceImpl