|
|
@@ -110,18 +110,18 @@ public class IotHomeServiceImpl implements IIotHomeService {
|
|
|
for(IotHomeDeviceListResVo item : dataList) {
|
|
|
IotDevice deviceInfo = deviceMap.get(item.getDevBid());
|
|
|
// 测试使用
|
|
|
- String devStatus = "0";
|
|
|
- if(deviceInfo == null) {
|
|
|
- deviceInfo = new IotDevice();
|
|
|
- }else{
|
|
|
- devStatus = deviceInfo.getDevStatus();
|
|
|
- }
|
|
|
- item.setDevStatus(devStatus);
|
|
|
- // 正式使用
|
|
|
-// if(deviceInfo == null){
|
|
|
-// continue;
|
|
|
+// String devStatus = "0";
|
|
|
+// if(deviceInfo == null) {
|
|
|
+// deviceInfo = new IotDevice();
|
|
|
+// }else{
|
|
|
+// devStatus = deviceInfo.getDevStatus();
|
|
|
// }
|
|
|
-// item.setDevStatus(deviceInfo.getDevStatus());
|
|
|
+// item.setDevStatus(devStatus);
|
|
|
+ // 正式使用
|
|
|
+ if(deviceInfo == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ item.setDevStatus(deviceInfo.getDevStatus());
|
|
|
|
|
|
item.setDevName(deviceInfo.getDevName());
|
|
|
resultList.add(item);
|