From 3b0eb831990d7a43de6c028187754049f2c32cad Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 23 Sep 2020 09:49:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/web/DeviceInstanceController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java index e23425d9..98ce27a3 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java +++ b/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) .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 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) From 70712620b18d567eedb9e19d586ffb5b049d1a06 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 23 Sep 2020 09:49:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetlinks/community/device/web/excel/DeviceExcelInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/excel/DeviceExcelInfo.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/excel/DeviceExcelInfo.java index 7c990593..5cacb635 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/excel/DeviceExcelInfo.java +++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/excel/DeviceExcelInfo.java @@ -35,6 +35,8 @@ public class DeviceExcelInfo { private long rowNumber; + private String state; + public void config(String key, Object value) { if (value == null) { return; @@ -101,7 +103,8 @@ public class DeviceExcelInfo { new ExcelHeader("name", "设备名称", CellDataType.STRING), new ExcelHeader("productName", "设备型号", CellDataType.STRING), new ExcelHeader("orgName", "所属机构", CellDataType.STRING), - new ExcelHeader("parentId", "父设备ID", CellDataType.STRING) + new ExcelHeader("parentId", "父设备ID", CellDataType.STRING), + new ExcelHeader("state", "状态", CellDataType.STRING) )); for (PropertyMetadata tag : tags) { arr.add(new ExcelHeader(tag.getId(), StringUtils.isEmpty(tag.getName()) ? tag.getId() : tag.getName(), CellDataType.STRING));