数据过滤

2024年8月14日09:24:06

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);
     }
 }

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;
     }
 }

modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java

@@ -208,8 +208,8 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
             QueryWrapper queryWrapper = QueryWrapper
                     .create()
                     .select(max(IOT_THING_DICT_ENTITY.SORT));
-            queryWrapper.where(IOT_THING_DICT_ENTITY.IS_DEFAULT.eq(1)
-                    .or(IOT_THING_DICT_ENTITY.IS_DEFAULT.eq(0).and(IOT_THING_DICT_ENTITY.TENANT_CODE.eq(UserContext.getRealTenantCode()))));
+            queryWrapper.where(IOT_THING_DICT_ENTITY.IS_DEFAULT.eq(0)
+                    .or(IOT_THING_DICT_ENTITY.IS_DEFAULT.eq(1).and(IOT_THING_DICT_ENTITY.TENANT_CODE.eq(UserContext.getRealTenantCode()))));
             Long num = mapper.selectOneByQueryAs(queryWrapper, Long.class);
             return Objects.isNull(num) ? 1 : num+1;
         }