|
|
@ -62,6 +62,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|
|
|
@GET
|
|
|
|
@GET
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Response getDevices(
|
|
|
|
public Response getDevices(
|
|
|
|
|
|
|
|
@QueryParam("name") String name,
|
|
|
|
@QueryParam("type") String type,
|
|
|
|
@QueryParam("type") String type,
|
|
|
|
@QueryParam("user") String user,
|
|
|
|
@QueryParam("user") String user,
|
|
|
|
@QueryParam("roleName") String roleName,
|
|
|
|
@QueryParam("roleName") String roleName,
|
|
|
@ -79,6 +80,9 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|
|
|
PaginationResult result;
|
|
|
|
PaginationResult result;
|
|
|
|
DeviceList devices = new DeviceList();
|
|
|
|
DeviceList devices = new DeviceList();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(name != null && !name.isEmpty()){
|
|
|
|
|
|
|
|
request.setDeviceName(name);
|
|
|
|
|
|
|
|
}
|
|
|
|
if (type != null && !type.isEmpty()) {
|
|
|
|
if (type != null && !type.isEmpty()) {
|
|
|
|
request.setDeviceType(type);
|
|
|
|
request.setDeviceType(type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|