From 96b6520db843d1905f6a15266f4217af019761ad Mon Sep 17 00:00:00 2001 From: willy <2462310981@qq.com> Date: Sat, 12 Jul 2025 18:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E3=80=81=E7=AD=89=E7=BA=A7=E3=80=81=E5=A5=96=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lottery/dto/Prize.java | 51 ---------------------- .../src/main/java/com/lottery/entity/Grade.java | 43 ++++++++++++++++++ .../src/main/java/com/lottery/entity/Prize.java | 17 +------- .../src/main/java/com/lottery/vo/GradeVo.java | 19 ++++++++ .../src/main/java/com/lottery/vo/PrizeVo.java | 23 ++++++++++ .../lottery/api/controller/GradeController.java | 44 +++++++++++++++++++ .../lottery/api/controller/PrizeController.java | 41 +++++++++++++++++ .../com/lottery/api/controller/UserController.java | 14 ++---- .../java/com/lottery/api/mapper/IGradeMapper.java | 17 ++++++++ .../java/com/lottery/api/mapper/IPrizeMapper.java | 8 ++-- .../com/lottery/api/service/IGradeService.java | 15 +++++++ .../com/lottery/api/service/IPrizeService.java | 7 +-- .../lottery/api/service/Impl/GradeServiceImpl.java | 19 ++++++++ .../lottery/api/service/Impl/PrizeServiceImpl.java | 21 ++------- .../src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/gradeMapper.xml | 5 +++ 16 files changed, 243 insertions(+), 103 deletions(-) delete mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/dto/Prize.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Grade.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/vo/GradeVo.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeVo.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/api/controller/GradeController.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/api/controller/PrizeController.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IGradeMapper.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/api/service/IGradeService.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/GradeServiceImpl.java create mode 100644 lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/Prize.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/Prize.java deleted file mode 100644 index ea0a26e..0000000 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/Prize.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lottery.dto; - -/** - * @program: lottery-system - * @ClassName Gift - * @description: - * @author:jihaipeng - * @create: 2025−07-10 15:20 - * @Version 1.0 - **/ -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Prize { - // 主键ID - private Long id; - - // 名称 - private String name; - - // 描述 - private String description; - - // 图片URL - private String imageUrl; - - // 库存数量 - private Integer stock; - - // 中奖概率 - private BigDecimal probability; - - // 奖品类型 - private Integer prizeType; - - // 状态 - private Integer status; - - // 创建时间 - private Date createTime; - - // 更新时间 - private Date updateTime; -} \ No newline at end of file diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Grade.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Grade.java new file mode 100644 index 0000000..3010b3d --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Grade.java @@ -0,0 +1,43 @@ +package com.lottery.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @program: lottery-system + * @ClassName Grade + * @description: + * @author: wwl + * @create: 2025-07-12 17:31 + * @Version 1.0 + **/ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("grade") +public class Grade { + + @TableId(type = IdType.AUTO) // 主键自增策略 + private Long id; + + @TableField("name") + private String name; // 等级名称 + + private int amount; //等级数量 + + private int sort; + + @TableField("pre_win") + private int preWin; + + @TableField(value = "create_time", fill = FieldFill.INSERT) // 自动填充创建时间 + private Date createTime; + + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) // 自动填充更新时间 + private Date updateTime; +} diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Prize.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Prize.java index 0be6e22..9b8e603 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Prize.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Prize.java @@ -15,8 +15,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; import java.util.Date; + @Data @AllArgsConstructor @NoArgsConstructor @@ -29,24 +29,11 @@ public class Prize { // 名称 private String name; - // 描述 - private String description; + private Long gradeId; // 图片URL private String imageUrl; - // 库存数量 - private Integer stock; - - // 中奖概率 - private BigDecimal probability; - - // 奖品类型 - private Integer prizeType; - - // 状态 - private Integer status; - // 创建时间 private Date createTime; diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/GradeVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/GradeVo.java new file mode 100644 index 0000000..c58e972 --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/GradeVo.java @@ -0,0 +1,19 @@ +package com.lottery.vo; + +import lombok.Data; + +/** + * @program: lottery-system + * @ClassName GradeVo + * @description: + * @author: wwl + * @create: 2025-07-12 17:32 + * @Version 1.0 + **/ +@Data +public class GradeVo { + + private String name; + + private int amount; +} diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeVo.java new file mode 100644 index 0000000..4b76a3c --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeVo.java @@ -0,0 +1,23 @@ +package com.lottery.vo; + +import lombok.Data; + +/** + * @program: lottery-system + * @ClassName PrizeVo + * @description: + * @author: wwl + * @create: 2025-07-12 16:48 + * @Version 1.0 + **/ +@Data +public class PrizeVo { + + private String name; + + private String imageUrl; + +// private int amount; +// +// private int grade; +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/GradeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/GradeController.java new file mode 100644 index 0000000..c49f039 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/GradeController.java @@ -0,0 +1,44 @@ +package com.lottery.api.controller; + +import com.lottery.api.mapper.IGradeMapper; +import com.lottery.api.service.IGradeService; +import com.lottery.entity.Grade; +import com.lottery.result.Result; +import com.lottery.utils.ConvertBeanUtil; +import com.lottery.vo.GradeVo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @program: lottery-system + * @ClassName gradeController + * @description: + * @author: wwl + * @create: 2025-07-12 17:30 + * @Version 1.0 + **/ + +@RestController +@RequestMapping("api/grade") +public class GradeController { + + @Autowired + private IGradeService gradeService; + + private final static Logger LOGGER = LoggerFactory.getLogger(GradeController.class); + + @GetMapping("/list") + public Result> getAllGrade(){ + LOGGER.info("查询全部等级"); + + List list = gradeService.list(); + return Result.success(ConvertBeanUtil.convertList(list, GradeVo.class)); + } +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/PrizeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/PrizeController.java new file mode 100644 index 0000000..e342e45 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/PrizeController.java @@ -0,0 +1,41 @@ +package com.lottery.api.controller; + +import com.lottery.entity.Prize; +import com.lottery.result.Result; +import com.lottery.api.service.IPrizeService; +import com.lottery.utils.ConvertBeanUtil; +import com.lottery.vo.PrizeVo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @program: lottery-system + * @ClassName PrizeController + * @description: + * @author: wwl + * @create: 2025-07-12 16:45 + * @Version 1.0 + **/ +@RestController +@RequestMapping("api/prize") +public class PrizeController { + + @Autowired + private IPrizeService prizeService; + + private final static Logger LOGGER = LoggerFactory.getLogger(PrizeController.class); + + @GetMapping("/list") + public Result> getAllPrize(){ + + LOGGER.info("查询所有礼品"); + List list = prizeService.list(); + return Result.success(ConvertBeanUtil.convertList(list,PrizeVo.class)); + } +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java index 37b9f9f..17ee70c 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java @@ -4,16 +4,14 @@ import com.lottery.dto.UserLoginDto; import com.lottery.entity.User; import com.lottery.exception.Accountexception; import com.lottery.api.service.IUserService; +import com.lottery.utils.ConvertBeanUtil; import com.lottery.utils.JwtUtil; import com.lottery.vo.UserLoginVo; import com.lottery.vo.UserVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.lottery.result.Result; import java.util.ArrayList; @@ -69,15 +67,11 @@ public class UserController { return Result.success(userLoginVo); } + @GetMapping("/list") public Result> getAllUser(){ LOGGER.info("查询所有用户"); List list = userService.list(); - List list1 = new ArrayList<>(); - - for (User user : list) { - - } - return Result.success(list1); + return Result.success(ConvertBeanUtil.convertList(list, UserVo.class)); } } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IGradeMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IGradeMapper.java new file mode 100644 index 0000000..fbc7610 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IGradeMapper.java @@ -0,0 +1,17 @@ +package com.lottery.api.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lottery.entity.Grade; +import org.apache.ibatis.annotations.Mapper; + +/** + * @program: lottery-system + * @ClassName IGradeMapper + * @description: + * @author: wwl + * @create: 2025-07-12 17:36 + * @Version 1.0 + **/ +@Mapper +public interface IGradeMapper extends BaseMapper { +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java index a7325a4..faa8ec5 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java @@ -1,6 +1,7 @@ package com.lottery.api.mapper; -import com.lottery.dto.Prize; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lottery.entity.Prize; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; @@ -14,9 +15,6 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper -public interface IPrizeMapper { +public interface IPrizeMapper extends BaseMapper { - @Insert("INSERT INTO prize (name, description, image_url, stock, probability, prize_type, status, create_time, update_time) " + - "VALUES (#{name}, #{description}, #{imageUrl}, #{stock}, #{probability}, #{prizeType}, #{status}, #{createTime}, #{updateTime})") - boolean add(Prize prize); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IGradeService.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IGradeService.java new file mode 100644 index 0000000..9e4af23 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IGradeService.java @@ -0,0 +1,15 @@ +package com.lottery.api.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lottery.entity.Grade; + +/** + * @program: lottery-system + * @ClassName IGradeService + * @description: + * @author: wwl + * @create: 2025-07-12 17:35 + * @Version 1.0 + **/ +public interface IGradeService extends IService { +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java index 80e7078..f027e5d 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java @@ -1,6 +1,7 @@ package com.lottery.api.service; -import com.lottery.dto.Prize; +import com.baomidou.mybatisplus.extension.service.IService; +import com.lottery.entity.Prize; /** * @program: lottery-system @@ -11,7 +12,7 @@ import com.lottery.dto.Prize; * @Version 1.0 **/ -public interface IPrizeService { - boolean add(Prize prize); +public interface IPrizeService extends IService { + } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/GradeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/GradeServiceImpl.java new file mode 100644 index 0000000..19e22db --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/GradeServiceImpl.java @@ -0,0 +1,19 @@ +package com.lottery.api.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lottery.api.mapper.IGradeMapper; +import com.lottery.api.service.IGradeService; +import com.lottery.entity.Grade; +import org.springframework.stereotype.Service; + +/** + * @program: lottery-system + * @ClassName GradeServiceImpl + * @description: + * @author: wwl + * @create: 2025-07-12 17:36 + * @Version 1.0 + **/ +@Service +public class GradeServiceImpl extends ServiceImpl implements IGradeService { +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java index 177ec20..a0d6a17 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java @@ -1,8 +1,9 @@ package com.lottery.api.service.Impl; -import com.lottery.dto.Prize; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lottery.api.mapper.IPrizeMapper; import com.lottery.api.service.IPrizeService; +import com.lottery.entity.Prize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,23 +20,7 @@ import java.util.Date; **/ @Service -public class PrizeServiceImpl implements IPrizeService { +public class PrizeServiceImpl extends ServiceImpl implements IPrizeService { - @Autowired - private IPrizeMapper prizeMapper; - @Override - public boolean add(Prize prize) { - prize.setName("测试"); - prize.setDescription("测试"); - prize.setImageUrl("测试"); - prize.setStock(1); - prize.setProbability(new BigDecimal(0.1)); - prize.setPrizeType(1); - prize.setStatus(1); - prize.setCreateTime(new Date()); - prize.setUpdateTime(new Date()); - - return prizeMapper.add(prize); - } } diff --git a/lottery-system/lottery-service/src/main/resources/application.yml b/lottery-system/lottery-service/src/main/resources/application.yml index a41ffb8..ca5467b 100644 --- a/lottery-system/lottery-service/src/main/resources/application.yml +++ b/lottery-system/lottery-service/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: datasource: url: jdbc:mysql://localhost:3306/lottery_system?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root - password: root + password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: LotteryHikariCP diff --git a/lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml new file mode 100644 index 0000000..881a719 --- /dev/null +++ b/lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file