Merge remote-tracking branch 'origin/master'

jetlinks · Dec 27, 2023 · 73fa760 · 73fa760
2 parents a7114c6 + 46360df
commit 73fa760
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ice-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java b/...ice-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java
@@ -360,6 +360,15 @@ public Mono<PagerResult<DeviceProperty>> queryDeviceProperties(@PathVariable @Pa
         return queryParam.flatMap(param -> deviceDataService.queryPropertyPage(deviceId, param, property.split(",")));
     }
 
+    @PostMapping("/{deviceId:.+}/property/{property}/_query/no-paging")
+    @QueryAction
+    @Operation(summary = "(POST)查询设备指定属性列表(不分页)")
+    public Flux<DeviceProperty> queryDevicePropertiesNoPaging(@PathVariable @Parameter(description = "设备ID") String deviceId,
+                                                              @PathVariable @Parameter(description = "属性ID") String property,
+                                                              @RequestBody Mono<QueryParamEntity> queryParam) {
+        return queryParam.flatMapMany(param -> deviceDataService.queryProperty(deviceId, param, property.split(",")));
+    }
+
     //查询属性列表
     @GetMapping("/{deviceId:.+}/properties/_query")
     @QueryAction

diff --git a/jetlinks-standalone/src/main/resources/application.yml b/jetlinks-standalone/src/main/resources/application.yml
@@ -224,6 +224,7 @@ springdoc:
         - org.jetlinks.community.auth
         - org.hswebframework.web.system.authorization.defaults.webflux
         - org.hswebframework.web.file
+        - org.jetlinks.community.io.file.web
         - org.hswebframework.web.authorization.basic.web
         - org.jetlinks.community.logging.controller
   cache:
@@ -232,4 +233,4 @@ network:
   resources:
     - 1883-1890
     - 8800-8810
-    - 5060-5061
+    - 5060-5061