|
|
@@ -2,6 +2,7 @@ package com.zhongshu.iot.server.core.service.device;
|
|
|
|
|
|
import com.github.microservice.busInfoModel.device.DeviceInfoModel;
|
|
|
import com.github.microservice.busInfoModel.device.DeviceInfoMoreModel;
|
|
|
+import com.github.microservice.busInfoModel.device.IotTemplateSimpleModel;
|
|
|
import com.github.microservice.net.ResultContent;
|
|
|
import com.github.microservice.types.FunctionType;
|
|
|
import com.github.microservice.types.deviceUse.DeviceState;
|
|
|
@@ -473,8 +474,10 @@ public class DeviceInfoService {
|
|
|
BeanUtils.copyProperties(deviceInfo, deviceInfoModel);
|
|
|
// 分组信息
|
|
|
deviceInfoModel.setProjectInfo(projectInfoService.toSimpleModel(deviceInfo.getProjectInfo()));
|
|
|
+ IotTemplateSimpleModel iotTemplate = iotService.toSimpleModel(deviceInfo.getProductCode());
|
|
|
// 产品信息
|
|
|
- deviceInfoModel.setIotTemplate(iotService.toSimpleModel(deviceInfo.getProductCode()));
|
|
|
+ deviceInfoModel.setIotTemplate(iotTemplate);
|
|
|
+ deviceInfoModel.setProductName(iotTemplate != null ? iotTemplate.getName() : "");
|
|
|
}
|
|
|
return deviceInfoModel;
|
|
|
}
|