diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/MqttClientConnectModel.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/MqttClientConnectModel.java index c9192b5b..c5b5708f 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/MqttClientConnectModel.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/MqttClientConnectModel.java @@ -27,7 +27,7 @@ public class MqttClientConnectModel private Integer proto_ver; /** 时间戳(秒) **/ - private Integer connected_at; + private Long connected_at; /** 错误原因 **/ private String reason; @@ -80,11 +80,11 @@ public class MqttClientConnectModel this.proto_ver = proto_ver; } - public Integer getConnected_at() { + public Long getConnected_at() { return connected_at; } - public void setConnected_at(Integer connected_at) { + public void setConnected_at(Long connected_at) { this.connected_at = connected_at; } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index d0cad52b..96205dd8 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -242,8 +242,8 @@ public class DeviceServiceImpl implements IDeviceService { JSONObject thingsModelObject = JSONObject.parseObject(thingsModelService.getCacheThingsModelByProductId(deviceList.get(i).getProductId())); JSONArray properties = thingsModelObject.getJSONArray("properties"); JSONArray functions = thingsModelObject.getJSONArray("functions"); - // 物模型转换为对象中的不同类别集合 - convertJsonToCategoryList(properties, deviceList.get(i), true, true); + // 物模型转换为对象中的不同类别集合,isOnlyRead忘了干啥用的,暂时保留吧 + convertJsonToCategoryList(properties, deviceList.get(i), true, false); convertJsonToCategoryList(functions, deviceList.get(i), true, false); deviceList.get(i).setThingsModelValue(""); } diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue index 100d3c24..c10a0710 100644 --- a/vue/src/views/iot/device/index.vue +++ b/vue/src/views/iot/device/index.vue @@ -82,19 +82,19 @@ {{subItem.shadow==""?"0":subItem.shadow}} {{subItem.unit==null?"":subItem.unit}} @@ -102,7 +102,7 @@ @@ -110,7 +110,7 @@ @@ -118,7 +118,7 @@ @@ -126,7 +126,7 @@