feat: 设备查询支持按source筛选,区分自营/第三方设备
- DeviceServiceImpl.queryPage 增加 source 筛选条件 - 自营设备 source=DIRECT(激活码激活,DB默认值) - 第三方设备 source=PARTNER(OpenAPI注册,显式设置)
This commit is contained in:
@@ -27,6 +27,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, DeviceEntity> impl
|
||||
String status = (String) params.get("status");
|
||||
String deviceName = (String) params.get("deviceName");
|
||||
String mac = (String) params.get("mac");
|
||||
String source = (String) params.get("source");
|
||||
|
||||
IPage<DeviceEntity> page = this.page(
|
||||
new Query<DeviceEntity>().getPage(params, "created_at", false),
|
||||
@@ -35,6 +36,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, DeviceEntity> impl
|
||||
.eq(StringUtils.isNotBlank(status), "status", status)
|
||||
.like(StringUtils.isNotBlank(deviceName), "device_name", deviceName)
|
||||
.like(StringUtils.isNotBlank(mac), "mac", mac)
|
||||
.eq(StringUtils.isNotBlank(source), "source", source)
|
||||
.eq("delete_flag", "UNDEL")
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user