分页加文档导出

pom.xml

@@ -231,7 +231,11 @@
             <artifactId>velocity-engine-core</artifactId>
             <version>2.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.13</version>
+        </dependency>
 
     </dependencies>
 
@@ -242,6 +246,21 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.github.shalousun</groupId>
+                <artifactId>smart-doc-maven-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <!--指定生成文档的使用的配置文件,配置文件放在自己的项目中-->
+                    <configFile>./src/main/resources/smart-doc.json</configFile>
+                    <!--指定项目名称-->
+                    <projectName>test</projectName>
+                    <!--                    <excludes>-->
+                    <!--                        <exclude>com.bizmatics:product-service-provider</exclude>-->
+                    <!--                        <exclude>cn.afterturn:easypoi-web</exclude>-->
+                    <!--                    </excludes>-->
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/usky/dxtop/common/core/page/CommonPage.java

@@ -0,0 +1,51 @@
+package com.usky.dxtop.common.core.page;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 分页类. 用于分页接口响应
+ * 结构从IPage复制而来.
+ *
+ * @param <T>
+ */
+@Data
+public class CommonPage<T> {
+    private static final long serialVersionUID = 8545996863226528798L;
+    protected List<T> records;
+    protected long total;
+    protected long size;
+    protected long current;
+
+    public CommonPage() {
+
+    }
+
+    public CommonPage(List<T> records, long total, long size, long current) {
+        this.records = records;
+        this.total = total;
+        this.size = size;
+        this.current = current;
+    }
+
+    /**
+     * 计算虚假total.
+     * 该total不是真实的数量, 只能给出是否还有下一页.
+     *
+     * @param current
+     * @param size
+     * @param currentSize
+     * @return
+     */
+    public static int fakeTotal(long current, long size, long currentSize) {
+        int total = 0;
+        if (currentSize >= size) {
+            total += current * size + 1;
+        } else {
+            total += (current - 1) * size + currentSize;
+        }
+        return total;
+    }
+
+}

src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -35,13 +35,18 @@ public class OrderController extends BaseController {
      * @return
      */
     @PostMapping
-    public AjaxResult add(Order order){
+    public AjaxResult add(@RequestBody Order order){
         return toAjax(orderService.add(order));
     }
 
+    /**
+     * 分页
+     * @param orderRequest
+     * @return
+     */
     @GetMapping("/list")
-    public List<Order> list(@RequestBody OrderRequest orderRequest){
-        return orderService.list(orderRequest);
+    public AjaxResult list(@RequestBody OrderRequest orderRequest){
+        return AjaxResult.success(orderService.list(orderRequest));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/QrCodeController.java

@@ -22,9 +22,7 @@ import java.net.ConnectException;
 import java.util.List;
 
 /**
- * <p>
- *  前端控制器
- * </p>
+ *  二维码管理
  *
  * @author yq
  * @since 2021-08-26
@@ -76,14 +74,20 @@ public class QrCodeController extends BaseController {
         return toAjax(qrCodeService.updateById(qrCode));
     }
 
+    /**
+     * 分页
+     * @param
+     * @return
+     */
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody QrCode qrCode)
+    public AjaxResult list(@RequestParam Integer current,
+                           @RequestParam Integer size,
+                           @RequestParam(required = false) String name)
     {
-        startPage();
-        List<QrCode> list = qrCodeService.list(qrCode);
-        return getDataTable(list);
+        return AjaxResult.success(qrCodeService.list(current, size, name));
     }
 
+
     /**
      * 删除
      */

src/main/java/com/usky/dxtop/controller/web/TopChannelController.java

@@ -17,9 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * <p>
- * 充值渠道 前端控制器
- * </p>
+ * 充值渠道
  *
  * @author yq
  * @since 2021-08-26
@@ -62,12 +60,17 @@ public class TopChannelController extends BaseController {
         return toAjax(topChannelService.updateById(topChannel));
     }
 
+    /**
+     * 分页
+     * @param
+     * @return
+     */
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody TopChannel topChannel)
+    public AjaxResult list(@RequestParam Integer current,
+                              @RequestParam Integer size,
+                              @RequestParam(required = false) String name)
     {
-        startPage();
-        List<TopChannel> list = topChannelService.list(topChannel);
-        return getDataTable(list);
+        return AjaxResult.success(topChannelService.list(current, size, name));
     }
 
 

src/main/java/com/usky/dxtop/controller/web/TopNotifyController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.TreeMap;
 
 /**
+ * 充值回调
  * @author yq
  * @date 2021/8/30 10:40
  */

src/main/java/com/usky/dxtop/controller/web/TopRadioController.java

@@ -23,9 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * <p>
- * 充值到账比例 前端控制器
- * </p>
+ * 充值到账比例
  *
  * @author yq
  * @since 2021-08-26
@@ -67,12 +65,17 @@ public class TopRadioController extends BaseController {
         return toAjax(topRadioService.updateById(topRadio));
     }
 
+    /**
+     * 分页
+     * @param
+     * @return
+     */
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody TopRadio topRadio)
+    public AjaxResult list(@RequestParam Integer current,
+                           @RequestParam Integer size,
+                           @RequestParam(required = false) String identity)
     {
-        startPage();
-        List<TopRadio> list = topRadioService.list(topRadio);
-        return getDataTable(list);
+        return AjaxResult.success(topRadioService.list(current, size, identity));
     }
 
 

src/main/java/com/usky/dxtop/mapper/QrCodeMapper.java

@@ -2,8 +2,11 @@ package com.usky.dxtop.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.dxtop.model.QrCode;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -18,5 +21,6 @@ import java.util.List;
 public interface QrCodeMapper extends BaseMapper<QrCode> {
 
 
-    List<QrCode> list(QrCode qrCode);
+    Page<QrCode> list(IPage<QrCode> page,
+                          @RequestParam String name);
 }

src/main/java/com/usky/dxtop/service/OrderService.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.vo.OrderRequest;
 
@@ -26,7 +27,7 @@ public interface OrderService extends IService<Order> {
     boolean add(Order order);
 
 
-    List<Order> list(OrderRequest orderRequest);
+    CommonPage<Order> list(OrderRequest orderRequest);
 
     /**
      * 扫码支付api

src/main/java/com/usky/dxtop/service/QrCodeService.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.QrCode;
 import com.usky.dxtop.model.TopRadio;
 
@@ -20,7 +21,7 @@ public interface QrCodeService extends IService<QrCode> {
     String checkNameUnique(QrCode qrCode);
 
 
-    List<QrCode> list(QrCode qrCode);
+    CommonPage<QrCode> list(Integer current, Integer size, String name);
 
 
     boolean remove(Long id);

src/main/java/com/usky/dxtop/service/TopChannelService.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.TopChannel;
 import com.usky.dxtop.model.TopRadio;
 
@@ -19,8 +20,7 @@ public interface TopChannelService extends IService<TopChannel> {
 
     String checkNameUnique(TopChannel topChannel);
 
-
-    List<TopChannel> list(TopChannel topChannel);
+    CommonPage<TopChannel> list(Integer current,Integer size,String name);
 
     boolean remove(Long id);
 

src/main/java/com/usky/dxtop/service/TopRadioService.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.TopRadio;
 import org.apache.catalina.LifecycleState;
 
@@ -22,5 +23,5 @@ public interface TopRadioService extends IService<TopRadio> {
     String checkIdentityUnique(TopRadio topRadio);
 
 
-    List<TopRadio> list(TopRadio topRadio);
+    CommonPage<TopRadio> list(Integer current, Integer size, String identity);
 }

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -3,9 +3,11 @@ package com.usky.dxtop.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.xml.internal.ws.api.ComponentEx;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.Arith;
 import com.usky.dxtop.common.utils.QRCodeUtil;
@@ -15,6 +17,7 @@ import com.usky.dxtop.common.utils.spring.GlobalUtils;
 import com.usky.dxtop.mapper.OrderMapper;
 import com.usky.dxtop.model.CallApiLog;
 import com.usky.dxtop.model.Order;
+import com.usky.dxtop.model.TopRadio;
 import com.usky.dxtop.service.CallApiLogService;
 import com.usky.dxtop.service.OrderService;
 import com.usky.dxtop.service.api.TopApi;
@@ -57,7 +60,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public List<Order> list(OrderRequest orderRequest) {
+    public CommonPage<Order> list(OrderRequest orderRequest) {
+        IPage<Order> page = new Page<>(orderRequest.getCurrent(), orderRequest.getSize());
         LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper
                 .like(StringUtils.isNotBlank(orderRequest.getUserName()),Order::getUserName,orderRequest.getUserName())
@@ -68,7 +72,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .between(null != orderRequest.getStartTime() && null != orderRequest.getEndTime(),
                         Order::getCreateTime,orderRequest.getStartMoney(),orderRequest.getEndTime())
                 .eq(null != orderRequest.getOrderFlag(),Order::getOrderFlag,orderRequest.getOrderFlag());
-        return this.list(queryWrapper);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 
 

src/main/java/com/usky/dxtop/service/impl/QrCodeServiceImpl.java

@@ -2,9 +2,12 @@ package com.usky.dxtop.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.constant.UserConstants;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.common.utils.file.FileUtils;
@@ -42,8 +45,10 @@ public class QrCodeServiceImpl extends ServiceImpl<QrCodeMapper, QrCode> impleme
     }
 
     @Override
-    public List<QrCode> list(QrCode qrCode) {
-        return baseMapper.list(qrCode);
+    public CommonPage<QrCode> list(Integer current,Integer size,String name) {
+        IPage<QrCode> page = new Page<>(current, size);
+        page = baseMapper.list(page,name);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 
     @Override

src/main/java/com/usky/dxtop/service/impl/TopChannelServiceImpl.java

@@ -1,10 +1,13 @@
 package com.usky.dxtop.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.usky.dxtop.common.constant.UserConstants;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.TopChannelMapper;
@@ -45,11 +48,13 @@ public class TopChannelServiceImpl extends ServiceImpl<TopChannelMapper, TopChan
     }
 
     @Override
-    public List<TopChannel> list(TopChannel topChannel) {
+    public CommonPage<TopChannel> list(Integer current,Integer size,String name) {
+        IPage<TopChannel> page = new Page<>(current, size);
         LambdaQueryWrapper<TopChannel> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(topChannel.getName()),TopChannel::getName,topChannel.getName())
+        queryWrapper.like(StringUtils.isNotBlank(name),TopChannel::getName,name)
                 .eq(TopChannel::isDelFlag,false);
-        return this.list(queryWrapper);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 
     @Override

src/main/java/com/usky/dxtop/service/impl/TopRadioServiceImpl.java

@@ -2,9 +2,12 @@ package com.usky.dxtop.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.constant.UserConstants;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.TopRadioMapper;
 import com.usky.dxtop.model.QrCode;
@@ -40,10 +43,12 @@ public class TopRadioServiceImpl extends ServiceImpl<TopRadioMapper, TopRadio> i
     }
 
     @Override
-    public List<TopRadio> list(TopRadio topRadio) {
+    public CommonPage<TopRadio> list(Integer current, Integer size, String identity) {
+        IPage<TopRadio> page = new Page<>(current, size);
         LambdaQueryWrapper<TopRadio> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(topRadio.getIdentity()),TopRadio::getIdentity,topRadio.getIdentity())
+        queryWrapper.like(StringUtils.isNotBlank(identity),TopRadio::getIdentity,identity)
                 .eq(TopRadio::isDelFlag,false);
-        return this.list(queryWrapper);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 }

src/main/java/com/usky/dxtop/service/vo/OrderRequest.java

@@ -43,4 +43,8 @@ public class OrderRequest {
     private Double startMoney;
 
     private Double endMoney;
+
+    public Integer current;
+
+    public Integer size;
 }

src/main/resources/mapper/QrCodeMapper.xml

@@ -12,7 +12,7 @@
         <result property="updateBy"      column="update_by"      />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
-    <select id="list" parameterType="com.usky.dxtop.model.QrCode" resultType="com.usky.dxtop.model.QrCode">
+    <select id="list" resultType="com.usky.dxtop.model.QrCode">
         select qc.*,tc.name as topChannelName
         from
         qr_code as qc
@@ -26,4 +26,5 @@
         </where>
     </select>
 
+
 </mapper>