diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java index 0434eb0..1c4615c 100644 --- a/src/main/java/com/example/demo/controller/DouController.java +++ b/src/main/java/com/example/demo/controller/DouController.java @@ -1,13 +1,13 @@ package com.example.demo.controller; -import com.example.demo.domain.dou.Member; -import com.example.demo.domain.dou.Records; -import com.example.demo.domain.dou.Searchinfo; +import com.example.demo.domain.dou.*; +import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; import com.example.demo.sevice.DouService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,12 +22,28 @@ public class DouController { private final DouService douService; @RequestMapping("/search") public Result search(@RequestBody Searchinfo jwcode){ - System.out.println(douService.searchinfo(jwcode)); return Result.success(douService.searchinfo(jwcode)); } @RequestMapping("/add") public Result add(@RequestBody Records records){ - System.out.println(records); return Result.success(douService.add(records)); } + + @RequestMapping("/getYve") + public Result getYve(@RequestBody Page page){ + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.success(douService.getYve(page.getYve())); + } else { + return Result.success(douService.searchForPage(page.getPageNum(), page.getPageSize(), page.getYve())); + } + } + @RequestMapping("/getYveTotal") + public Result getYveTotal(@RequestBody YveTotal yveTotal){ + System.out.println(douService.getYveTotal(yveTotal)); + return Result.success(douService.getYveTotal(yveTotal)); + } + @RequestMapping("/getIp") + public Result getIp(){ + return Result.success(douService.getIp()); + } } diff --git a/src/main/java/com/example/demo/domain/dou/Yve.java b/src/main/java/com/example/demo/domain/dou/Yve.java new file mode 100644 index 0000000..8d17395 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dou/Yve.java @@ -0,0 +1,24 @@ +package com.example.demo.domain.dou; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Yve implements Serializable { + + private static final long serialVersionUID = 1L; + + private String jwcode; + private String nickname; + private String ipAddress; + private Integer jinbi; + private Integer jinbiFree; + private Integer jinbiBuy; + private Integer jinbiCostTotal; + private String token; +} diff --git a/src/main/java/com/example/demo/domain/dou/YveTotal.java b/src/main/java/com/example/demo/domain/dou/YveTotal.java new file mode 100644 index 0000000..83ba592 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dou/YveTotal.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.dou; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class YveTotal { + private Integer jinbiBuy; + private Integer jinbiCostTotal; + private Integer jinbiFree; + private String token; + private String ipAddress; + private String 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 bdbdf0e..5f6a40d 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -1,6 +1,7 @@ package com.example.demo.domain.vo; +import com.example.demo.domain.dou.Yve; import com.example.demo.domain.entity.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @@ -28,6 +29,7 @@ public class Page implements Serializable { private DetailY detailY; private DetailYVo detailYVo; private DetailYgold detailYgold; + private Yve yve; } diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java index 9c1549f..f474a4b 100644 --- a/src/main/java/com/example/demo/mapperLink/DouMapper.java +++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java @@ -1,14 +1,18 @@ package com.example.demo.mapperLink; -import com.example.demo.domain.dou.Member; -import com.example.demo.domain.dou.Records; -import com.example.demo.domain.dou.Searchinfo; +import com.example.demo.domain.dou.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface DouMapper { int add(Records Records); Member searchinfo(Searchinfo jwcode); int searchId(@Param("jwcode")String jwcode); + List getYve(Yve yve); + YveTotal getYveTotal(YveTotal yveTotal); + List getIp(); + } diff --git a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java index ab0144b..ff2fe7c 100644 --- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java @@ -1,16 +1,18 @@ package com.example.demo.serviceImpl; -import com.example.demo.domain.dou.Balance; -import com.example.demo.domain.dou.Member; -import com.example.demo.domain.dou.Records; -import com.example.demo.domain.dou.Searchinfo; +import com.example.demo.domain.dou.*; +import com.example.demo.domain.vo.RechargeVo; import com.example.demo.mapperLink.DouMapper; import com.example.demo.sevice.DouService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheConfig; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @Transactional @RequiredArgsConstructor @@ -36,4 +38,26 @@ public class DouServiceImpl implements DouService { return douMapper.searchinfo(jwcode); } + + @Override + public List getYve(Yve yve) { + return douMapper.getYve(yve); + } + + @Override + public YveTotal getYveTotal(YveTotal yveTotal) { + return douMapper.getYveTotal(yveTotal); + } + + @Override + public List getIp() { + return douMapper.getIp(); + } + + @Override + public Object searchForPage(Integer pageNum, Integer pageSize, Yve yve) { + PageHelper.startPage(pageNum, pageSize); + List list= douMapper.getYve(yve); + return new PageInfo<>(list); + } } diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java index 91eb6c2..fc56d6f 100644 --- a/src/main/java/com/example/demo/sevice/DouService.java +++ b/src/main/java/com/example/demo/sevice/DouService.java @@ -1,14 +1,18 @@ package com.example.demo.sevice; -import com.example.demo.domain.dou.Balance; -import com.example.demo.domain.dou.Member; -import com.example.demo.domain.dou.Records; -import com.example.demo.domain.dou.Searchinfo; +import com.example.demo.domain.dou.*; +import com.example.demo.domain.vo.RechargeVo; import org.springframework.stereotype.Service; +import java.util.List; public interface DouService { int add(Records records); Member searchinfo(Searchinfo jwcode); + List getYve(Yve yve); + YveTotal getYveTotal(YveTotal yveTotal); + List getIp(); + + Object searchForPage(Integer pageNum, Integer pageSize, Yve yve); } diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index 202adf4..23bd93c 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -24,4 +24,45 @@ + + + + \ No newline at end of file