From 49aec5df04b4a3bd1f57065e9cd699311a3bccd2 Mon Sep 17 00:00:00 2001
From: tangfudong <280620913@qq.com>
Date: Sat, 9 Mar 2024 01:24:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/init/thingModel.json                     | 33 +++++++++++++------
 .../data/service/DeviceInfoDataImpl.java      |  5 ---
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/data/init/thingModel.json b/data/init/thingModel.json
index a4bc161b..ab51831c 100755
--- a/data/init/thingModel.json
+++ b/data/init/thingModel.json
@@ -1003,10 +1003,10 @@
         {
           "identifier": "swing_modes",
           "dataType": {
-            "type": "enum",
+            "type": "bool",
             "specs": {
-              "off": "关",
-              "on": "开"
+              "0": "关",
+              "1": "开"
             }
           },
           "name": "扫风开关",
@@ -1017,10 +1017,10 @@
           "dataType": {
             "type": "enum",
             "specs": {
-              "heat": "制热",
-              "off": "关闭",
-              "cool": "制冷",
-              "fan_only": "送风"
+              "0": "制热",
+              "1": "关闭",
+              "2": "制冷",
+              "3": "送风"
             }
           },
           "name": "模式",
@@ -1031,13 +1031,26 @@
           "dataType": {
             "type": "enum",
             "specs": {
-              "high": "高",
-              "medium": "中",
-              "low": "低"
+              "0": "高",
+              "1": "中",
+              "2": "低"
             }
           },
           "name": "风模式",
           "accessMode": "rw"
+        },
+        {
+          "identifier": "presets_modes",
+          "dataType": {
+            "type": "enum",
+            "specs": {
+              "0": "节能",
+              "1": "睡眠",
+              "2": "活动"
+            }
+          },
+          "name": "预设模式",
+          "accessMode": "rw"
         }
       ],
       "services": [
diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
index 63f3c1b8..b05c0071 100644
--- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
+++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
@@ -448,11 +448,6 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
         return new Paging<>(ret.getTotalElements(), MapstructUtils.convert(ret.getContent(), DeviceInfo.class));
     }
 
-    @Override
-    public List<DeviceInfo> findAllByCondition(DeviceInfo data) {
-        return Collections.emptyList();
-    }
-
     @Override
     public DeviceInfo findOneByCondition(DeviceInfo data) {
         return null;