Commit ce970a18 authored by 赵啸非's avatar 赵啸非

修改接口设备更新站点后,站点名称和编码未更新问题

parent aaa27ee8
......@@ -36,6 +36,11 @@ public class DeviceInfo implements Serializable {
*/
private String productName;
/**
* 产品编码
*/
private String productCode;
/**
* 设备启用状态 (0.停止,1.启用)
*/
......
......@@ -268,6 +268,7 @@ public class DeviceApiController {
List<ProductInfo> productInfoList = productService.find(new ProductEntity()).stream().map(item -> {
ProductInfo productInfo = new ProductInfo();
BeanUtils.copyProperties(item, productInfo, BeanUtil.getNullPropertyNames(item));
productInfo.setProductId(item.getId());
return productInfo;
}).collect(Collectors.toList());
......@@ -395,6 +396,7 @@ public class DeviceApiController {
deviceInfo.setSiteCode(deviceEntity.getSiteCode());
deviceInfo.setSiteName(deviceEntity.getSiteName());
deviceInfo.setProductId(productEntity.getId());
deviceInfo.setProductCode(productEntity.getProductCode());
deviceInfo.setProductName(productEntity.getProductName());
deviceInfo.setEnabled(deviceEntity.getEnabled());
deviceInfo.setSource(deviceEntity.getSource());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment