1

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 # 当没有偏移量或偏移量无效时，从何处开始消费

dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java

@@ -90,9 +90,10 @@ public class DeviceController {
     public HttpResultResponse<PaginationData<DeviceDTO>> 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<DeviceDTO> devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain);
+        PaginationData<DeviceDTO> devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain,nickname);
 
         return HttpResultResponse.success(devices);
     }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java

@@ -128,7 +128,7 @@ public interface IDeviceService {
      * @param domain
      * @return
      */
-    PaginationData<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain);
+    PaginationData<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain,String nickname);
 
     /**
      * Unbind device base on device's sn.

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<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page,
-                                                               Long pageSize, Integer domain) {
+                                                               Long pageSize, Integer domain,String nickname) {
 
         Page<DeviceEntity> pagination = mapper.selectPage(new Page<>(page, pageSize),
                 new LambdaQueryWrapper<DeviceEntity>()
                         .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<DeviceDTO> devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO)
                 .peek(device -> {
                     device.setStatus(deviceRedisService.checkDeviceOnline(device.getDeviceSn()));

dk-modules/sample/src/main/resources/logback-plus.xml

@@ -12,10 +12,10 @@
             <pattern>${console.log.pattern}</pattern>
             <charset>utf-8</charset>
         </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
-            <!-- 过滤的级别 -->
+<!--            &lt;!&ndash; 过滤的级别 &ndash;&gt;-->
-            <level>ERROR</level>
+<!--            <level>ERROR</level>-->
-        </filter>
+<!--        </filter>-->
     </appender>
 
     <include resource="logback-common.xml" />