diff --git a/dk-example/test-mq/src/main/resources/application.yml b/dk-example/test-mq/src/main/resources/application.yml index bad4382..df74196 100644 --- a/dk-example/test-mq/src/main/resources/application.yml +++ b/dk-example/test-mq/src/main/resources/application.yml @@ -23,7 +23,7 @@ spring: --- # kafka 配置 spring: kafka: - bootstrap-servers: localhost:9092 + bootstrap-servers: 114.235.183.147:9092 consumer: group-id: test-group-id # 消费者组ID auto-offset-reset: earliest # 当没有偏移量或偏移量无效时,从何处开始消费 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java index 4ca130d..10cf9d1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java @@ -90,9 +90,10 @@ public class DeviceController { public HttpResultResponse> getBoundDevicesWithDomain( @PathVariable("workspace_id") String workspaceId,Integer domain, @RequestParam(name = "pageNum", defaultValue = "1") Long page, - @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize) { + @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize, + @RequestParam(name = "nickname",required = false) String nickname) { LoginUser loginUser = LoginHelper.getLoginUser(); - PaginationData devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain); + PaginationData devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain,nickname); return HttpResultResponse.success(devices); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java index 036c77d..b8056a0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java @@ -128,7 +128,7 @@ public interface IDeviceService { * @param domain * @return */ - PaginationData getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain); + PaginationData getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain,String nickname); /** * Unbind device base on device's sn. diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java index 16b21ec..4afdd1a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java @@ -483,13 +483,14 @@ public class DeviceServiceImpl implements IDeviceService { @Override public PaginationData getBoundDevicesWithDomain(String workspaceId, Long page, - Long pageSize, Integer domain) { + Long pageSize, Integer domain,String nickname) { Page pagination = mapper.selectPage(new Page<>(page, pageSize), new LambdaQueryWrapper() .eq(DeviceEntity::getDomain, domain) .eq(DeviceEntity::getWorkspaceId, workspaceId) - .eq(DeviceEntity::getBoundStatus, true)); + .eq(DeviceEntity::getBoundStatus, true) + .eq(org.dromara.common.core.utils.StringUtils.isNotEmpty(nickname),DeviceEntity::getNickname,nickname)); List devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO) .peek(device -> { device.setStatus(deviceRedisService.checkDeviceOnline(device.getDeviceSn())); diff --git a/dk-modules/sample/src/main/resources/logback-plus.xml b/dk-modules/sample/src/main/resources/logback-plus.xml index 242ca0b..a2fd413 100644 --- a/dk-modules/sample/src/main/resources/logback-plus.xml +++ b/dk-modules/sample/src/main/resources/logback-plus.xml @@ -12,10 +12,10 @@ ${console.log.pattern} utf-8 - - - ERROR - + + + +