From c842317d103ca7709d3e1c85244e09a87ec6b91d Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 8 Jun 2020 18:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/device/web/DeviceInstanceController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 1fa165a7..d69e413f 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 @@ -369,9 +369,12 @@ public class DeviceInstanceController implements .flatMap(DeviceProductOperator::getMetadata) .map(metadata -> new DeviceWrapper(metadata.getTags())) .defaultIfEmpty(DeviceWrapper.empty) + .zipWith(productService.findById(productId)) .flatMapMany(wrapper -> importExportService .getInputStream(fileUrl) - .flatMapMany(inputStream -> ReactorExcel.read(inputStream, FileUtils.getExtension(fileUrl), wrapper))) + .flatMapMany(inputStream -> ReactorExcel.read(inputStream, FileUtils.getExtension(fileUrl), wrapper.getT1())) + .doOnNext(info -> info.setProductName(wrapper.getT2().getName())) + ) .map(info -> { DeviceInstanceEntity entity = FastBeanCopier.copy(info, new DeviceInstanceEntity()); entity.setProductId(productId);