浏览代码

增加设备状态导出

zhou-hao 4 年之前
父节点
当前提交
3b0eb83199

+ 12 - 3
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java

@@ -423,7 +423,11 @@ public class DeviceInstanceController implements
                     .converter(DeviceExcelInfo::toMap)
                     .converter(DeviceExcelInfo::toMap)
                     .writeBuffer(
                     .writeBuffer(
                         service.query(parameter)
                         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)
                             .buffer(200)
                             .flatMap(list -> {
                             .flatMap(list -> {
                                 Map<String, DeviceExcelInfo> importInfo = list
                                 Map<String, DeviceExcelInfo> importInfo = list
@@ -457,8 +461,13 @@ public class DeviceInstanceController implements
             .headers(DeviceExcelInfo.getExportHeaderMapping(Collections.emptyList(),Collections.emptyList()))
             .headers(DeviceExcelInfo.getExportHeaderMapping(Collections.emptyList(),Collections.emptyList()))
             .converter(DeviceExcelInfo::toMap)
             .converter(DeviceExcelInfo::toMap)
             .writeBuffer(
             .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
                 , 512 * 1024)//缓冲512k
             .doOnError(err -> log.error(err.getMessage(), err))
             .doOnError(err -> log.error(err.getMessage(), err))
             .map(bufferFactory::wrap)
             .map(bufferFactory::wrap)