From 99a0b0f800918120b755a69f5e372adcd1482e4d Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 24 Jun 2025 11:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AF=A6=E6=83=85=E5=88=86=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/ConsumeController.java | 16 +++++++++++++--- .../com/example/demo/controller/GeneralController.java | 6 ++++++ src/main/java/com/example/demo/domain/vo/Consume.java | 2 -- src/main/java/com/example/demo/domain/vo/Page.java | 1 + src/main/java/com/example/demo/mapper/GeneralMapper.java | 1 + .../java/com/example/demo/service/ConsumeService.java | 4 +++- .../java/com/example/demo/service/GeneralService.java | 1 + .../com/example/demo/serviceImpl/ConsumeServiceImpl.java | 7 +++++-- .../com/example/demo/serviceImpl/GeneralServiceImpl.java | 6 ++++++ src/main/resources/mapper/GeneralMapper.xml | 3 +++ 10 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index ba12bcf..8091107 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -2,11 +2,13 @@ package com.example.demo.controller; import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; +import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; import com.example.demo.service.ConsumeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -32,10 +34,18 @@ public class ConsumeController { //消耗明细 @PostMapping("/selectAll") - public Result selcetAll() + public Result selcetAll(@RequestBody Page page) { - List consumes = consumeService.selectAll(); - return Result.success(consumes); + if(ObjectUtils.isEmpty(page.getPageNum())){ + return Result.error("页码数为空！"); + } + if(ObjectUtils.isEmpty(page.getPageSize())){ + return Result.error("页大小为空！"); + } + else{ + return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize())); + } + } //消耗金币统计 diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java index a7ae932..f22a320 100644 --- a/src/main/java/com/example/demo/controller/GeneralController.java +++ b/src/main/java/com/example/demo/controller/GeneralController.java @@ -41,4 +41,10 @@ public class GeneralController { List list = generalService.getPlatform(); return Result.success(list); } + @PostMapping("/goods") + public Result getGoods() + { + List list = generalService.getGoods(); + return Result.success(list); + } } diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java index 45429eb..c3482e2 100644 --- a/src/main/java/com/example/demo/domain/vo/Consume.java +++ b/src/main/java/com/example/demo/domain/vo/Consume.java @@ -21,8 +21,6 @@ import java.util.Date; public class Consume implements Serializable { private static final long serialVersionUID = 1L; - private Integer pageNum; //页数 - private Integer pageSize; //页面大小 private String name; // 客户姓名 private Integer jwcode; // 精网号 diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/Page.java index 36d7d9d..ebcc338 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -19,5 +19,6 @@ public class Page { private Integer pageNum; private Integer pageSize; private GoldDetail goldDetail; + private Consume consume; } diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/GeneralMapper.java index aca7d39..8913458 100644 --- a/src/main/java/com/example/demo/mapper/GeneralMapper.java +++ b/src/main/java/com/example/demo/mapper/GeneralMapper.java @@ -16,4 +16,5 @@ import java.util.List; public interface GeneralMapper { List getMarket(); List getPlatform(); + List getGoods(); } diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java index 7c52636..3219d50 100644 --- a/src/main/java/com/example/demo/service/ConsumeService.java +++ b/src/main/java/com/example/demo/service/ConsumeService.java @@ -3,6 +3,8 @@ package com.example.demo.service; import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; +import com.example.demo.domain.vo.GoldDetail; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -16,7 +18,7 @@ import java.util.List; **/ public interface ConsumeService { - List selectAll(); + PageInfo selectAll(Integer pageNum, Integer pageSize); Gold statsGold(); } diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java index 530bc15..479be34 100644 --- a/src/main/java/com/example/demo/service/GeneralService.java +++ b/src/main/java/com/example/demo/service/GeneralService.java @@ -14,4 +14,5 @@ import java.util.List; public interface GeneralService { List getMarket(); List getPlatform(); + List getGoods(); } diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 0aa9b33..36decaf 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -4,6 +4,8 @@ import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; import com.example.demo.mapper.ConsumeMapper; import com.example.demo.service.ConsumeService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,9 +28,10 @@ public class ConsumeServiceImpl implements ConsumeService { //消耗明细 @Override - public List selectAll() { + public PageInfo selectAll(Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum, pageSize); List consumes = consumeMapper.selectAll(); - return consumes; + return new PageInfo<>(consumes); } //消耗金币统计 diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index 5c6d8b5..311e218 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -32,4 +32,10 @@ public class GeneralServiceImpl implements GeneralService { List list = generalMapper.getPlatform(); return list; } + + @Override + public List getGoods() { + List list = generalMapper.getGoods(); + return list; + } } diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml index 73522f5..99103e2 100644 --- a/src/main/resources/mapper/GeneralMapper.xml +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -8,4 +8,7 @@ + \ No newline at end of file