|
|
@@ -109,20 +109,11 @@ public class IotHomeServiceImpl implements IIotHomeService {
|
|
|
List<IotHomeDeviceListResVo> resultList = new ArrayList<>();
|
|
|
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;
|
|
|
}
|
|
|
item.setDevStatus(deviceInfo.getDevStatus());
|
|
|
-
|
|
|
+ item.setDevCode(deviceInfo.getDevCode());
|
|
|
item.setDevName(deviceInfo.getDevName());
|
|
|
resultList.add(item);
|
|
|
}
|