From 5b193dd1833404a69044cc2eb618cce544556aba Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 26 Oct 2020 12:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96creatorId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/device/web/DeviceInstanceController.java | 8 +++++--- 1 file changed, 5 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 63c101ae..0ca42e84 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 @@ -14,6 +14,7 @@ import org.hswebframework.web.api.crud.entity.PagerResult; import org.hswebframework.web.api.crud.entity.QueryNoPagingOperation; import org.hswebframework.web.api.crud.entity.QueryOperation; import org.hswebframework.web.api.crud.entity.QueryParamEntity; +import org.hswebframework.web.authorization.Authentication; import org.hswebframework.web.authorization.annotation.*; import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.crud.web.reactive.ReactiveServiceCrudController; @@ -166,9 +167,10 @@ public class DeviceInstanceController implements @PostMapping @Operation(summary = "新建设备") public Mono add(@RequestBody Mono payload) { - return payload.flatMap(entity -> service.insert(Mono.just(entity)) - .onErrorMap(DuplicateKeyException.class, err -> new BusinessException("设备ID已存在", err)) - .thenReturn(entity)); + return Mono + .zip(payload, Authentication.currentReactive(), this::applyAuthentication) + .flatMap(entity -> service.insert(Mono.just(entity)).thenReturn(entity)) + .onErrorMap(DuplicateKeyException.class, err -> new BusinessException("设备ID已存在", err)); } /**