TRX 1 سال پیش
والد
کامیت
6cb9739727

+ 1 - 1
OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotMainAttributeModel.java

@@ -18,5 +18,5 @@ import lombok.NoArgsConstructor;
 public class IotMainAttributeModel extends IotMainModel {
 
     @Schema(description = "属性对应的最新值")
-    private IotDeviceDataModel value;
+    private Object value;
 }

+ 10 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotDeviceDataService.java

@@ -133,6 +133,16 @@ public class IotDeviceDataService {
         return null;
     }
 
+    public Object getDeviceProperty(String deviceId, String property) {
+        if (StringUtils.isNotEmpty(deviceId) && StringUtils.isNotEmpty(property)) {
+            IotDeviceData entity = getDevicePropertyObject(deviceId, property);
+            if (entity != null) {
+                return entity.getValue();
+            }
+        }
+        return "";
+    }
+
     /**
      * 查询值
      *

+ 1 - 1
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -717,7 +717,7 @@ public class IotServiceImpl extends SuperService {
 
             // 属性值
             if (entity.getFunctionType() == FunctionType.Attribute && entity.getIotDataType() == IotDataType.Device) {
-                model.setValue(iotDeviceDataService.getDevicePropertyModel(entity.getDeviceId(), entity.getIdentifier()));
+                model.setValue(iotDeviceDataService.getDeviceProperty(entity.getDeviceId(), entity.getIdentifier()));
             }
         }
         return model;