Explorar o código

add 设置网桥初始值

18339543638 %!s(int64=4) %!d(string=hai) anos
pai
achega
beddffbce8

+ 2 - 1
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/web/AliBridgeServerController.java

@@ -82,7 +82,8 @@ public class AliBridgeServerController implements
     @Operation(summary = "注册网桥设备")
     @Operation(summary = "注册网桥设备")
     @CreateAction
     @CreateAction
     public Mono<Void> register(@PathVariable("bridgeId") String id,@RequestBody AliIotBridgeDeviceConfig config){
     public Mono<Void> register(@PathVariable("bridgeId") String id,@RequestBody AliIotBridgeDeviceConfig config){
-        return Mono.zip(bridgeService.createQuery()
+        return Mono.zip(
+            bridgeService.createQuery()
                 .where(AliIotBridgeEntity::getDeviceName,config.getDeviceName())
                 .where(AliIotBridgeEntity::getDeviceName,config.getDeviceName())
                 .count()
                 .count()
                 .doOnNext(count->{
                 .doOnNext(count->{

+ 4 - 4
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/web/AliIotApiController.java

@@ -36,24 +36,24 @@ public class AliIotApiController {
     @PostMapping("/product/query/{currentPage}/{pageSize}")
     @PostMapping("/product/query/{currentPage}/{pageSize}")
     @Operation(summary = "获取阿里云产品信息")
     @Operation(summary = "获取阿里云产品信息")
     public Mono<?>  queryPageProducts(@PathVariable("currentPage") Integer currentPage,@PathVariable("pageSize") Integer pageSize,
     public Mono<?>  queryPageProducts(@PathVariable("currentPage") Integer currentPage,@PathVariable("pageSize") Integer pageSize,
-                                         @RequestBody AliApiParam param){
+                                      @RequestBody AliApiParam param){
         try {
         try {
             verifyCommonParam(param);
             verifyCommonParam(param);
             return aliIotService.queryIotProductPage(param,currentPage,pageSize);
             return aliIotService.queryIotProductPage(param,currentPage,pageSize);
         }catch (ClientException e){
         }catch (ClientException e){
-            return Mono.error(new BusinessException(e.getMessage()));
+            return Mono.error(new BusinessException("阿里云参数配置错误:"+e.getErrMsg()));
         }
         }
     }
     }
 
 
     @PostMapping("/device/query/{currentPage}/{pageSize}")
     @PostMapping("/device/query/{currentPage}/{pageSize}")
     @Operation(summary = "获取阿里云产品下设备信息")
     @Operation(summary = "获取阿里云产品下设备信息")
     public Mono<?>  queryPageDevices(@PathVariable("currentPage") Integer currentPage,@PathVariable("pageSize") Integer pageSize,
     public Mono<?>  queryPageDevices(@PathVariable("currentPage") Integer currentPage,@PathVariable("pageSize") Integer pageSize,
-                                      @RequestBody AliApiParam param){
+                                     @RequestBody AliApiParam param){
         try {
         try {
             verifyDeviceParam(param);
             verifyDeviceParam(param);
             return aliIotService.queryIotDevicePage(param,currentPage,pageSize);
             return aliIotService.queryIotDevicePage(param,currentPage,pageSize);
         }catch (ClientException e){
         }catch (ClientException e){
-            return Mono.error(new BusinessException(e.getMessage()));
+            return Mono.error(new BusinessException("阿里云参数配置错误:"+e.getErrMsg()));
         }
         }
     }
     }