suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(设备管理): 添加post方式的设备属性列表查询接口 (#302)

This commit is contained in:
bestfeng1020 2023-06-01 15:15:17 +08:00 committed by GitHub
parent 3f01310a9d
commit ec66ae9ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DeviceDataService.java
View File

@ -157,6 +157,20 @@ public interface DeviceDataService {
@Nonnull String property,
@Nonnull QueryParamEntity query);
/**
* 分页查询属性
*
* @param deviceId 设备ID
* @param query 查询条件
* @return 分页查询结果
* @since 1.9
*/
@Nonnull
Mono<PagerResult<DeviceProperty>> queryPropertyPage(@Nonnull String deviceId,
@Nonnull QueryParamEntity query,
@Nonnull String... property);
/**
* 分页查询设备日志
*

12
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java
View File

@ -317,7 +317,17 @@ public class DeviceInstanceController implements
public Mono<PagerResult<DeviceProperty>> queryDeviceProperties(@PathVariable @Parameter(description = "设备ID") String deviceId,
@PathVariable @Parameter(description = "属性ID") String property,
@Parameter(hidden = true) QueryParamEntity entity) {
return deviceDataService.queryPropertyPage(deviceId, property, entity);
return deviceDataService.queryPropertyPage(deviceId, entity, property.split(","));
}
//查询属性列表
@PostMapping("/{deviceId:.+}/property/{property}/_query")
@QueryAction
@Operation(summary = "(POST)查询设备指定属性列表")
public Mono<PagerResult<DeviceProperty>> queryDeviceProperties(@PathVariable @Parameter(description = "设备ID") String deviceId,
@PathVariable @Parameter(description = "属性ID") String property,
@RequestBody Mono<QueryParamEntity> queryParam) {
return queryParam.flatMap(param -> deviceDataService.queryPropertyPage(deviceId, param, property.split(",")));
}
//查询属性列表