From 2d976b76346c2ea3bba9f12b778da4f46b8374bd Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 17 Feb 2020 17:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/supports/DefaultDeviceGatewayManager.java | 4 ++-- .../network/manager/service/DeviceGatewayConfigService.java | 2 +- .../network/manager/service/DeviceGatewayService.java | 2 +- .../network/manager/web/NetworkConfigController.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jetlinks-components/gateway-component/src/main/java/org/jetlinks/community/gateway/supports/DefaultDeviceGatewayManager.java b/jetlinks-components/gateway-component/src/main/java/org/jetlinks/community/gateway/supports/DefaultDeviceGatewayManager.java index 8503dbf4..2e47b455 100644 --- a/jetlinks-components/gateway-component/src/main/java/org/jetlinks/community/gateway/supports/DefaultDeviceGatewayManager.java +++ b/jetlinks-components/gateway-component/src/main/java/org/jetlinks/community/gateway/supports/DefaultDeviceGatewayManager.java @@ -31,10 +31,10 @@ public class DefaultDeviceGatewayManager implements DeviceGatewayManager, BeanPo } return propertiesManager .getProperties(id) - .switchIfEmpty(Mono.error(new UnsupportedOperationException("网关配置[" + id + "]不存在"))) + .switchIfEmpty(Mono.error(()->new UnsupportedOperationException("网关配置[" + id + "]不存在"))) .flatMap(properties -> Mono .justOrEmpty(providers.get(properties.getProvider())) - .switchIfEmpty(Mono.error(new UnsupportedOperationException("不支持的网络服务[" + properties.getProvider() + "]"))) + .switchIfEmpty(Mono.error(()->new UnsupportedOperationException("不支持的网络服务[" + properties.getProvider() + "]"))) .flatMap(provider -> provider .createDeviceGateway(properties) .flatMap(gateway -> { diff --git a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayConfigService.java b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayConfigService.java index 7b0b215c..13407c12 100644 --- a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayConfigService.java +++ b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayConfigService.java @@ -22,7 +22,7 @@ public class DeviceGatewayConfigService implements DeviceGatewayPropertiesManage return deviceGatewayService .findById(id) - .switchIfEmpty(Mono.error(new NotFoundException("该设备网关不存在"))) + .switchIfEmpty(Mono.error(()->new NotFoundException("该设备网关不存在"))) .map(deviceGatewayEntity -> { DeviceGatewayProperties properties = new DeviceGatewayProperties(); FastBeanCopier.copy(deviceGatewayEntity, properties); diff --git a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayService.java b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayService.java index 0e3e58de..e4a43288 100644 --- a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayService.java +++ b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/service/DeviceGatewayService.java @@ -47,7 +47,7 @@ public class DeviceGatewayService extends GenericReactiveCrudService deleteById(Publisher idPublisher) { return findById(Mono.from(idPublisher)) - .switchIfEmpty(Mono.error(new NotFoundException("改设备网关不存在"))) + .switchIfEmpty(Mono.error(()->new NotFoundException("改设备网关不存在"))) .doOnNext(deviceGatewayEntity -> { if (NetworkConfigState.enabled.equals(deviceGatewayEntity.getState())) { throw new UnsupportedOperationException("该设备网关已启用"); diff --git a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/web/NetworkConfigController.java b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/web/NetworkConfigController.java index de97698b..f9dc91ff 100644 --- a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/web/NetworkConfigController.java +++ b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/web/NetworkConfigController.java @@ -49,7 +49,7 @@ public class NetworkConfigController implements ReactiveServiceCrudController start(@PathVariable String id) { return configService.findById(id) - .switchIfEmpty(Mono.error(new NotFoundException("配置[" + id + "]不存在"))) + .switchIfEmpty(Mono.error(()->new NotFoundException("配置[" + id + "]不存在"))) .flatMap(conf -> configService.createUpdate() .set(NetworkConfigEntity::getState, NetworkConfigState.enabled) .where(conf::getId) @@ -61,7 +61,7 @@ public class NetworkConfigController implements ReactiveServiceCrudController shutdown(@PathVariable String id) { return configService.findById(id) - .switchIfEmpty(Mono.error(new NotFoundException("配置[" + id + "]不存在"))) + .switchIfEmpty(Mono.error(()->new NotFoundException("配置[" + id + "]不存在"))) .flatMap(conf -> configService.createUpdate() .set(NetworkConfigEntity::getState, NetworkConfigState.disabled) .where(conf::getId)