code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-18 00:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复设备显示和Webhook时间戳问题

Browse Source
This commit is contained in:
kerwincui
2022-03-18 20:28:15 +08:00
parent d81d612b1c
commit 1bc1fbb354
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/MqttClientConnectModel.java
View File

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

4
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
View File

@@ -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("");
}