From 57dd7619e0bf74c19bbcaa7277e40e2fa4de14d6 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 14 Aug 2024 09:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=202024?=
 =?UTF-8?q?=E5=B9=B48=E6=9C=8814=E6=97=A509:24:06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/thing/filter/rule/dto/FilterRuleDetailDTO.java     | 4 ++++
 .../java/com/thing/filter/rule/enumeration/DataType.java   | 7 ++++++-
 .../thing/dict/service/impl/IotThingDictServiceImpl.java   | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

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