diff --git a/pom.xml b/pom.xml index 96fae70..d04c2ed 100644 --- a/pom.xml +++ b/pom.xml @@ -13,19 +13,6 @@ 0.0.1-SNAPSHOT gb gb - - - - - - - - - - - - - 21 @@ -63,6 +50,11 @@ test + com.github.pagehelper + pagehelper + 5.3.1 + + org.junit.jupiter junit-jupiter-api 5.8.1 diff --git a/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java new file mode 100644 index 0000000..edaab17 --- /dev/null +++ b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java @@ -0,0 +1,23 @@ +package com.example.gb.bean.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LiveOrderVO { + private Integer id; + private String userRealName; + private Integer jwcode; + private String ipAddress; + private String type; + private Integer goldBeans; + private Integer goldFree; + private Integer goldBuy; + private String liveId; + private String liveName; + private String channelId; + private String channelName; +} diff --git a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java index aaa7069..88e41ea 100644 --- a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java +++ b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java @@ -1,4 +1,25 @@ package com.example.gb.controller; +//import com.github.pagehelper.PageInfo; +import com.example.gb.service.GoldbeanConsumeService; +import com.example.gb.util.Page; +import com.example.gb.util.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/admin/consume") public class GoldbeanConsumeController { + private GoldbeanConsumeService goldbeanConsumeService; + @Autowired + public void setGoldbeanConsumeService(GoldbeanConsumeService goldbeanConsumeService) { + this.goldbeanConsumeService = goldbeanConsumeService; + } + @GetMapping("/live/list") + public Result liveList(@RequestBody Page page){ + return goldbeanConsumeService.getLiveConsumeList(page); + } } diff --git a/src/main/java/com/example/gb/dao/GoldBeanMapper.java b/src/main/java/com/example/gb/dao/GoldBeanMapper.java deleted file mode 100644 index bd908df..0000000 --- a/src/main/java/com/example/gb/dao/GoldBeanMapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.gb.dao; - -public interface GoldBeanMapper { -} diff --git a/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java b/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java new file mode 100644 index 0000000..e592c8e --- /dev/null +++ b/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java @@ -0,0 +1,11 @@ +package com.example.gb.dao; + +import com.example.gb.bean.vo.LiveOrderVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface GoldbeanConsumeMapper { + List getLiveConsumeList(); +} diff --git a/src/main/java/com/example/gb/service/GoldbeanConsumeService.java b/src/main/java/com/example/gb/service/GoldbeanConsumeService.java new file mode 100644 index 0000000..0a8e06d --- /dev/null +++ b/src/main/java/com/example/gb/service/GoldbeanConsumeService.java @@ -0,0 +1,8 @@ +package com.example.gb.service; + +import com.example.gb.util.Page; +import com.example.gb.util.Result; + +public interface GoldbeanConsumeService { + Result getLiveConsumeList(Page page); +} diff --git a/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java new file mode 100644 index 0000000..122c169 --- /dev/null +++ b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java @@ -0,0 +1,33 @@ +package com.example.gb.service.impl; + +import com.example.gb.bean.vo.LiveOrderVO; +import com.example.gb.dao.GoldbeanConsumeMapper; +import com.example.gb.service.GoldbeanConsumeService; +import com.example.gb.util.Page; +import com.example.gb.util.Result; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class GoldbeanConsumeServiceImpl implements GoldbeanConsumeService { + private GoldbeanConsumeMapper goldbeanConsumeMapper; + @Autowired + public void setGoldbeanConsumeMapper(GoldbeanConsumeMapper goldbeanConsumeMapper) { + this.goldbeanConsumeMapper = goldbeanConsumeMapper; + } + @Override + public Result getLiveConsumeList(Page page) { + System.out.println("currentPage:"+ page.getCurrentPage()+ "pageSize:"+page.getPageSize()); + int currentPage = page.getCurrentPage() != null ? page.getCurrentPage() : 1; + int pageSize = page.getPageSize() != null ? page.getPageSize() : 10; + PageHelper.startPage(currentPage,pageSize); + List list = goldbeanConsumeMapper.getLiveConsumeList(); + PageInfo pageInfo = new PageInfo<>(list); + System.out.println("实际查询结果总数:" + pageInfo.getTotal() + ",当前页数据条数:" + pageInfo.getSize()); + return Result.success(pageInfo); + } +} diff --git a/src/main/java/com/example/gb/util/Page.java b/src/main/java/com/example/gb/util/Page.java new file mode 100644 index 0000000..f06abc8 --- /dev/null +++ b/src/main/java/com/example/gb/util/Page.java @@ -0,0 +1,15 @@ +package com.example.gb.util; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class Page { + private Integer pageSize; + private Integer currentPage; + private Integer total; + private Integer totalPage; + private Integer offSet; +} diff --git a/src/main/resources/mapper/GoldBeanMapper.xml b/src/main/resources/mapper/GoldBeanMapper.xml deleted file mode 100644 index df80713..0000000 --- a/src/main/resources/mapper/GoldBeanMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/GoldbeanConsumeMapper.xml b/src/main/resources/mapper/GoldbeanConsumeMapper.xml new file mode 100644 index 0000000..f2a5f67 --- /dev/null +++ b/src/main/resources/mapper/GoldbeanConsumeMapper.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TestMapper.xml b/src/main/resources/mapper/TestMapper.xml deleted file mode 100644 index e47d959..0000000 --- a/src/main/resources/mapper/TestMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file