设备查询

src/main/java/com/genersoft/iot/vmp/extend/dto/ExtendDevicePageDto.java

@@ -11,4 +11,9 @@ public class ExtendDevicePageDto extends PageInfo {
      */
     private String name;
 
+    /**
+     * 设备id
+     */
+    private String deviceId;
+
 }

src/main/java/com/genersoft/iot/vmp/extend/entity/ExtendDevice.java

@@ -38,26 +38,44 @@ public class ExtendDevice {
     @Size(max=255)
     private String name;
 
+    /**
+     * 制造商
+     */
     @TableField("manufacturer")
     @Size(max=255)
     private String manufacturer;
 
+    /**
+     * 型号
+     */
     @TableField("model")
     @Size(max=255)
     private String model;
 
+    /**
+     * 固件
+     */
     @TableField("firmware")
     @Size(max=255)
     private String firmware;
 
+    /**
+     * 指令传输模式
+     */
     @TableField("transport")
     @Size(max=50)
     private String transport;
 
+    /**
+     * 流传输模式
+     */
     @TableField("stream_mode")
     @Size(max=50)
     private String streamMode;
 
+    /**
+     * 在线状态
+     */
     @TableField("on_line")
     private Integer onLine;
 

src/main/java/com/genersoft/iot/vmp/extend/service/ExtendDeviceService.java

@@ -1,5 +1,7 @@
 package com.genersoft.iot.vmp.extend.service;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.genersoft.iot.vmp.extend.dto.ExtendDevicePageDto;
 import com.genersoft.iot.vmp.extend.entity.ExtendDevice;
@@ -18,6 +20,9 @@ public class ExtendDeviceService extends ServiceImpl<ExtendDeviceMapper, ExtendD
      */
     public PageInfo<ExtendDevice> page(ExtendDevicePageDto dto) {
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        LambdaQueryWrapper<ExtendDevice> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StrUtil.isNotBlank(dto.getName()),ExtendDevice :: getName,dto.getName());
+        lqw.like(StrUtil.isNotBlank(dto.getDeviceId()),ExtendDevice :: getDeviceId,dto.getDeviceId());
         return new PageInfo<>(this.list());
     }