suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

增加设备状态导出

This commit is contained in:
zhou-hao 2020-09-23 09:49:31 +08:00
parent 31ca222b70
commit 3b0eb83199
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java
View File

@ -423,7 +423,11 @@ public class DeviceInstanceController implements
.converter(DeviceExcelInfo::toMap)
.writeBuffer(
service.query(parameter)
.map(entity -> FastBeanCopier.copy(entity, new DeviceExcelInfo()))
.map(entity -> {
DeviceExcelInfo exportEntity = FastBeanCopier.copy(entity, new DeviceExcelInfo(),"state");
exportEntity.setState(entity.getState().getText());
return exportEntity;
})
.buffer(200)
.flatMap(list -> {
Map<String, DeviceExcelInfo> importInfo = list
@ -457,8 +461,13 @@ public class DeviceInstanceController implements
.headers(DeviceExcelInfo.getExportHeaderMapping(Collections.emptyList(),Collections.emptyList()))
.converter(DeviceExcelInfo::toMap)
.writeBuffer(
service.query(parameter)
.map(entity -> FastBeanCopier.copy(entity, new DeviceExcelInfo()))
service
.query(parameter)
.map(entity -> {
DeviceExcelInfo exportEntity = FastBeanCopier.copy(entity, new DeviceExcelInfo(),"state");
exportEntity.setState(entity.getState().getText());
return exportEntity;
})
, 512 * 1024)//缓冲512k
.doOnError(err -> log.error(err.getMessage(), err))
.map(bufferFactory::wrap)