Commit 233a2f7d89161cb8133b34696889b60bb09f0e2f

Authored by haohao
1 parent 3e7f7e1b

style(iot): 设备影子 Controller 改用链式 BeanUtils 组装 VO

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceShadowController.java
@@ -64,19 +64,19 @@ public class IotDeviceShadowController { @@ -64,19 +64,19 @@ public class IotDeviceShadowController {
64 Assert.notNull(prop, "属性不能为空"); 64 Assert.notNull(prop, "属性不能为空");
65 return new IotDeviceShadowPropertyRespVO() 65 return new IotDeviceShadowPropertyRespVO()
66 .setIdentifier(thingModel.getIdentifier()).setName(thingModel.getName()) 66 .setIdentifier(thingModel.getIdentifier()).setName(thingModel.getName())
67 - .setDataType(prop.getDataType()).setDataSpecs(prop.getDataSpecs()).setDataSpecsList(prop.getDataSpecsList()) 67 + .setDataType(prop.getDataType()).setDataSpecs(prop.getDataSpecs())
  68 + .setDataSpecsList(prop.getDataSpecsList())
68 .setDesiredValue(desired.get(thingModel.getIdentifier())) 69 .setDesiredValue(desired.get(thingModel.getIdentifier()))
69 .setReportedValue(reported.get(thingModel.getIdentifier())) 70 .setReportedValue(reported.get(thingModel.getIdentifier()))
70 .setDesiredTime(IotDeviceShadowProtocolUtils.getDesiredTimestamp(metadata, thingModel.getIdentifier())) 71 .setDesiredTime(IotDeviceShadowProtocolUtils.getDesiredTimestamp(metadata, thingModel.getIdentifier()))
71 .setReportedTime(IotDeviceShadowProtocolUtils.getReportedTimestamp(metadata, thingModel.getIdentifier())); 72 .setReportedTime(IotDeviceShadowProtocolUtils.getReportedTimestamp(metadata, thingModel.getIdentifier()));
72 }); 73 });
73 74
74 - IotDeviceShadowRespVO respVO = BeanUtils.toBean(shadow, IotDeviceShadowRespVO.class);  
75 - // toBean 会拷贝 DO 中同名标量;Map 字段须用下方已归一化的局部变量覆盖,避免 null 透传前端  
76 - respVO.setProperties(properties);  
77 - respVO.setDesired(desired);  
78 - respVO.setReported(reported);  
79 - respVO.setMetadata(metadata); 75 + IotDeviceShadowRespVO respVO = BeanUtils.toBean(shadow, IotDeviceShadowRespVO.class)
  76 + .setProperties(properties)
  77 + .setDesired(desired)
  78 + .setReported(reported)
  79 + .setMetadata(metadata);
80 return success(respVO); 80 return success(respVO);
81 } 81 }
82 82