From 0d04a302a854bf77645d7bef3d2e6915b3a4b1b8 Mon Sep 17 00:00:00 2001
From: xiwa <xw2sy@163.com>
Date: Wed, 17 Jan 2024 21:31:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B1=9E=E6=80=A7=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/init/ruleInfo.json                       | 38 +------------------
 .../ruleengine/filter/DeviceCondition.java    |  4 +-
 .../cc/iotkit/config/EmbeddedRedisConfig.java |  2 +-
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/data/init/ruleInfo.json b/data/init/ruleInfo.json
index f879d648..474b2362 100755
--- a/data/init/ruleInfo.json
+++ b/data/init/ruleInfo.json
@@ -1,40 +1,4 @@
-[
-  {
-    "id": "6b253651-f4f9-44b9-a802-115b668b68e1",
-    "name": "天猫精灵设备属性和状态推送",
-    "type": "flow",
-    "listeners": [
-      {
-        "type": "device",
-        "config": "{\"id\":\"077319c3-325b-4bb6-8e07-dd2eed617f6f\",\"type\":\"device\",\"topic\":\"\",\"conditions\":[{\"id\":0.6683545166149798,\"type\":\"property\",\"device\":\"cGCrkK7Ex4FESAwe/#\",\"identifier\":\"report\",\"parameters\":[{\"identifier\":\"powerstate\",\"comparator\":\"*\"}]},{\"id\":0.6047040921280786,\"type\":\"state\",\"device\":\"cGCrkK7Ex4FESAwe/#\",\"identifier\":\"state:*\",\"parameters\":[]}]}"
-      },
-      {
-        "type": "device",
-        "config": "{\"id\":\"08d72321-39d4-4dcc-ba69-b09c4af187a3\",\"type\":\"device\",\"topic\":\"\",\"conditions\":[{\"id\":0.7992853094329277,\"type\":\"event\",\"device\":\"KdJYpTp5ywNhmrmC/001\",\"identifier\":\"userDevicesChange\",\"parameters\":[{\"comparator\":\"*\"}]}]}"
-      },
-      {
-        "type": "device",
-        "config": "{\"id\":\"554aba1c-9684-4e36-8f72-cdb325f86712\",\"type\":\"device\",\"topic\":\"\",\"conditions\":[{\"id\":0.9179545682030454,\"type\":\"property\",\"device\":\"PN3EDmkBZDD8whDd/#\",\"identifier\":\"report\",\"parameters\":[{\"identifier\":\"doorStatus\",\"comparator\":\"*\"}]}]}"
-      }
-    ],
-    "filters": [
-      {
-        "type": "device",
-        "config": "{\"id\":\"0a8285df-f778-4e20-b26b-2b569fc1d3dd\",\"type\":\"device\",\"conditions\":[{\"id\":0.11425312074571847,\"device\":\"\",\"type\":\"tag\",\"identifier\":\"aligenie\",\"value\":\"是\",\"comparator\":\"==\"}]}"
-      }
-    ],
-    "actions": [
-      {
-        "type": "http",
-        "config": "{\"id\":\"de533da1-18cb-48ef-b913-22bdd96dcac9\",\"type\":\"http\",\"services\":[{\"url\":\"http://localhost:8087/aligenie/push\",\"script\":\"this.translate=function(msg){\\n  var data={};\\n  for(var p in msg.data){\\n\\tdata[p]=msg.data[p];\\n  }\\n  \\nreturn {\\n\\t//指定相对路径\\n    path:\\\"/\\\",\\n    method:\\\"post\\\",\\n    header:{\\n      //指定请求头\\n      contentType:\\\"application/json; charset=utf-8\\\"\\n    },\\n    body:JSON.stringify({\\n      deviceId:msg.deviceId,\\n      type:msg.type,\\n      identifier:msg.identifier,\\n      data:data\\n    })\\n  }\\n}\"}]}"
-      }
-    ],
-    "uid": "1",
-    "state": "stopped",
-    "desc": "ss",
-    "createAt": 1649218592640
-  },
-  {
+[{
     "id": "2c10229b-dcb2-439e-b411-5425b49657a1",
     "name": "小度设备属性更新推送",
     "type": "flow",
diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java
index 52c30be2..00353d84 100644
--- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java
+++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java
@@ -11,6 +11,7 @@ package cc.iotkit.ruleengine.filter;
 
 import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
+import cc.iotkit.model.device.message.DevicePropertyCache;
 import cc.iotkit.ruleengine.expression.Expression;
 import lombok.Data;
 
@@ -56,7 +57,8 @@ public class DeviceCondition {
         Object left = null;
         if ("property".equals(type)) {
             Map<String, ?> properties = deviceInfo.getProperty();
-            left = properties.get(identifier);
+            DevicePropertyCache propertyCache = (DevicePropertyCache) properties.get(identifier);
+            left = propertyCache.getValue();
         } else if ("state".equals(type)) {
             DeviceInfo.State state = deviceInfo.getState();
             left = state != null && state.isOnline();
diff --git a/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java b/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
index e5bcfaac..2640b67c 100644
--- a/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
+++ b/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
@@ -24,7 +24,7 @@ public class EmbeddedRedisConfig {
         String os = System.getProperty("os.name").toLowerCase();
         if (os.contains("windows")) {
             redisServer = RedisServer.builder().setting("maxheap 200m")
-                    .port(6379)
+                    .port(6378)
                     .setting("bind localhost")
                     .build();
         } else {