分页查询

src/main/java/com/genersoft/iot/vmp/extend/README.md

@@ -1,4 +1,5 @@
 # wvp-pro 扩展
+扩展原则是尽量不改动wvp标准代码，方便后续做升级。
 ## 1 登录拦截器放行内部接口
 com.genersoft.iot.vmp.conf.security.JwtAuthenticationFilter
 ```
@@ -14,4 +15,8 @@ com.genersoft.iot.vmp.conf.security.WebSecurityConfig
 matchers.add("/internal/**");
 ```
 ## 2 项目升级mybatis-plus
-需要修改 com.genersoft.iot.vmp.conf.MybatisConfig 最后代码注释掉
+原项目未使用mybatis-plus，引入需要修改 com.genersoft.iot.vmp.conf.MybatisConfig 最后代码注释掉
+启动类上添加手动扫描
+```
+@MapperScan(basePackages = {"com.genersoft.iot.vmp.storager.dao","com.genersoft.iot.vmp.extend.mapper"})
+```

src/main/java/com/genersoft/iot/vmp/extend/controller/ExtendDeviceController.java

@@ -1,15 +1,12 @@
 package com.genersoft.iot.vmp.extend.controller;
 
+import com.genersoft.iot.vmp.extend.dto.ExtendDevicePageDto;
 import com.genersoft.iot.vmp.extend.entity.ExtendDevice;
 import com.genersoft.iot.vmp.extend.service.ExtendDeviceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.github.pagehelper.PageInfo;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/internal/device")
@@ -18,9 +15,9 @@ public class ExtendDeviceController {
     @Resource
     private ExtendDeviceService deviceService;
 
-    @GetMapping("/page")
-    public List<ExtendDevice> devices(){
-        return deviceService.devices();
+    @PostMapping("/page")
+    public PageInfo<ExtendDevice> page(@RequestBody ExtendDevicePageDto dto) {
+        return deviceService.page(dto);
     }
 
 }

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

@@ -0,0 +1,14 @@
+package com.genersoft.iot.vmp.extend.dto;
+
+import com.github.pagehelper.PageInfo;
+import lombok.Data;
+
+@Data
+public class ExtendDevicePageDto extends PageInfo {
+
+    /**
+     * 设备名
+     */
+    private String name;
+
+}

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

@@ -13,6 +13,11 @@ import lombok.Data;
 @Data
 public class ExtendDevice {
 
+    /**
+     * 设备id
+     */
+    private String deviceId;
+
     /**
      * 设备名
      */

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

@@ -1,20 +1,24 @@
 package com.genersoft.iot.vmp.extend.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.genersoft.iot.vmp.extend.dto.ExtendDevicePageDto;
 import com.genersoft.iot.vmp.extend.entity.ExtendDevice;
 import com.genersoft.iot.vmp.extend.mapper.ExtendDeviceMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.List;
-
 @Service
 public class ExtendDeviceService extends ServiceImpl<ExtendDeviceMapper, ExtendDevice> {
 
-    public List<ExtendDevice> devices() {
-        QueryWrapper<ExtendDevice> queryWrapper = new QueryWrapper();
-        return this.list();
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    public PageInfo<ExtendDevice> page(ExtendDevicePageDto dto) {
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        return new PageInfo<>(this.list());
     }
+
 }