From 6275eb4aa5192be94cd800541e1b0cbf84f48cae Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Wed, 22 Jun 2022 14:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/iot/service/impl/DeviceServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 2bd7e6b0..0b5cd962 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 @@ -369,9 +369,10 @@ 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"); - // 物模型转换为对象中的不同类别集合,isOnlyRead忘了干啥用的，暂时保留吧 + // 物模型转换为对象中的不同类别集合 convertJsonToCategoryList(properties, deviceList.get(i), true, false); convertJsonToCategoryList(functions, deviceList.get(i), true, false); + // 置空物模型，已分配到不同类型中 deviceList.get(i).setThingsModelValue(""); } return deviceList; @@ -408,8 +409,15 @@ public class DeviceServiceImpl implements IDeviceService { // 获取value for (int j = 0; j < thingsValueArray.size(); j++) { if (thingsValueArray.getJSONObject(j).getString("id").equals(thingsModel.getId())) { - thingsModel.setValue(thingsValueArray.getJSONObject(j).getString("value")); - thingsModel.setShadow(thingsValueArray.getJSONObject(j).getString("shadow")); + String value=thingsValueArray.getJSONObject(j).getString("value"); + String shadow=thingsValueArray.getJSONObject(j).getString("shadow"); + thingsModel.setValue(value); + thingsModel.setShadow(shadow); + // bool 类型默认值为0，解决移动端报错问题 + if(thingsModel.getType().equals("bool")){ + thingsModel.setValue(value.equals("")?"0":value); + thingsModel.setShadow(shadow.equals("")?"0":shadow); + } break; } }