From d15bd952ec6580821e9cebd2d2a7863693ad5fe6 Mon Sep 17 00:00:00 2001 From: willy <2462310981@qq.com> Date: Mon, 14 Jul 2025 18:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=AD=89=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lottery/exception/SomeException.java | 21 +++++ .../src/main/java/com/lottery/result/Result.java | 6 +- .../src/main/java/com/lottery/dto/GradeDto.java | 27 ++++++ .../src/main/java/com/lottery/entity/Grade.java | 6 +- .../src/main/java/com/lottery/vo/GradeVo.java | 18 +++- .../main/java/com/lottery/vo/PrizeAndGradeVo.java | 3 +- .../main/java/com/lottery/LotteryApplication.java | 1 + .../admin/controller/AdminGradeController.java | 104 +++++++++++++++++++++ .../com/lottery/admin/mapper/AdminGradeMapper.java | 18 ++++ .../lottery/admin/service/AdminGradeService.java | 21 +++++ .../admin/service/Impl/AdminGradeServiceImpl.java | 42 +++++++++ .../lottery/api/controller/PrizeController.java | 9 +- .../java/com/lottery/api/mapper/IGradeMapper.java | 1 + .../lottery/api/service/Impl/GradeServiceImpl.java | 1 + .../lottery/api/service/Impl/PrizeServiceImpl.java | 2 - .../resources/mapper/admin/AdminGradeMapper.xml | 5 + .../resources/mapper/{ => api}/gradeMapper.xml | 0 .../resources/mapper/{ => api}/prizeMapper.xml | 6 +- .../main/resources/mapper/{ => api}/userMapper.xml | 0 19 files changed, 275 insertions(+), 16 deletions(-) create mode 100644 lottery-system/lottery-common/src/main/java/com/lottery/exception/SomeException.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/dto/GradeDto.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/AdminGradeMapper.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminGradeService.java create mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java create mode 100644 lottery-system/lottery-service/src/main/resources/mapper/admin/AdminGradeMapper.xml rename lottery-system/lottery-service/src/main/resources/mapper/{ => api}/gradeMapper.xml (100%) rename lottery-system/lottery-service/src/main/resources/mapper/{ => api}/prizeMapper.xml (62%) rename lottery-system/lottery-service/src/main/resources/mapper/{ => api}/userMapper.xml (100%) diff --git a/lottery-system/lottery-common/src/main/java/com/lottery/exception/SomeException.java b/lottery-system/lottery-common/src/main/java/com/lottery/exception/SomeException.java new file mode 100644 index 0000000..e63da81 --- /dev/null +++ b/lottery-system/lottery-common/src/main/java/com/lottery/exception/SomeException.java @@ -0,0 +1,21 @@ +package com.lottery.exception; + +/** + * @program: lottery-system + * @ClassName SomeException + * @description: + * @author: wwl + * @create: 2025-07-14 15:07 + * @Version 1.0 + **/ +public class SomeException extends BaseException { + + + public SomeException(){ + + } + + public SomeException(String massage){ + super(massage); + } +} diff --git a/lottery-system/lottery-common/src/main/java/com/lottery/result/Result.java b/lottery-system/lottery-common/src/main/java/com/lottery/result/Result.java index 5ff2d43..a6ad0e7 100644 --- a/lottery-system/lottery-common/src/main/java/com/lottery/result/Result.java +++ b/lottery-system/lottery-common/src/main/java/com/lottery/result/Result.java @@ -10,7 +10,7 @@ package com.lottery.result; **/ public class Result { - // 状态码（如 200 表示成功，500 表示失败） + // 状态码（如 200 表示成功，400 表示失败） private Integer code; // 提示信息（如 "操作成功" 或 "操作失败"） @@ -37,9 +37,9 @@ public class Result { } // 失败结果 - public static Result failure(int code, String message) { + public static Result failure(String message) { Result result = new Result<>(); - result.setCode(code); + result.setCode(400); result.setMessage(message); return result; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/GradeDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/GradeDto.java new file mode 100644 index 0000000..d885ef6 --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/GradeDto.java @@ -0,0 +1,27 @@ +package com.lottery.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +/** + * @program: lottery-system + * @ClassName GradeDto + * @description: + * @author: wwl + * @create: 2025-07-14 14:56 + * @Version 1.0 + **/ +@Data +public class GradeDto { + + private Long id; + + private String GradeName; // 等级名称 + + private Integer amount; //等级数量 + + private Integer sort; + + private Integer perWin; + +} 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 index c1aa7e1..cde609b 100644 --- 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 @@ -2,6 +2,7 @@ package com.lottery.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,6 +21,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @TableName("grade") +@Builder public class Grade { @TableId(type = IdType.AUTO) // 主键自增策略 @@ -31,8 +33,8 @@ public class Grade { private int sort; - @TableField("pre_win") - private int preWin; + @TableField("per_win") + private int perWin; @TableField(value = "create_time", fill = FieldFill.INSERT) // 自动填充创建时间 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 index c58e972..39a243d 100644 --- 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 @@ -1,7 +1,11 @@ package com.lottery.vo; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; +import java.util.Date; + /** * @program: lottery-system * @ClassName GradeVo @@ -13,7 +17,17 @@ import lombok.Data; @Data public class GradeVo { - private String name; + private Long id; + + private String GradeName; // 等级名称 + + private int amount; //等级数量 + + private int sort; + + private int perWin; + + private Date createTime; - private int amount; + private Date updateTime; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeAndGradeVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeAndGradeVo.java index 5871e0c..9079d77 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeAndGradeVo.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/PrizeAndGradeVo.java @@ -21,5 +21,6 @@ public class PrizeAndGradeVo { private int amount; - private int sort; + private int perWin; + } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/LotteryApplication.java b/lottery-system/lottery-service/src/main/java/com/lottery/LotteryApplication.java index cdcf3eb..2a4aec6 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/LotteryApplication.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/LotteryApplication.java @@ -1,5 +1,6 @@ package com.lottery; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java new file mode 100644 index 0000000..f5efe7c --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java @@ -0,0 +1,104 @@ +package com.lottery.admin.controller; + +import com.lottery.admin.mapper.AdminGradeMapper; +import com.lottery.admin.service.AdminGradeService; +import com.lottery.dto.GradeDto; +import com.lottery.entity.Grade; +import com.lottery.exception.SomeException; +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.stereotype.Service; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * @program: lottery-system + * @ClassName GradeController + * @description: + * @author: wwl + * @create: 2025-07-14 14:44 + * @Version 1.0 + **/ +@RestController +@RequestMapping("/admin/grade") +public class AdminGradeController { + + @Autowired + private AdminGradeService adminGradeService; + + @Autowired + private AdminGradeMapper adminGradeMapper; + + private final static Logger LOGGER = LoggerFactory.getLogger(AdminGradeController.class); + + + @GetMapping("/list") + public Result> selectGrade(){ + LOGGER.info("查询所有等级"); + return Result.success(ConvertBeanUtil.convertList(adminGradeService.list(), GradeVo.class)); + } + + @GetMapping("/details") + public Result selectById(@RequestParam Long id){ + LOGGER.info("根据id查找等级：{}",id); + return Result.success(ConvertBeanUtil.convert(adminGradeService.getById(id), GradeVo.class)); + } + + + @PostMapping("/add") + public Result add(@RequestBody GradeDto gradeDto){ + + LOGGER.info("新增等级：{}", gradeDto); + if (gradeDto.getGradeName() == null || gradeDto.getAmount() == null|| + gradeDto.getSort() == null || gradeDto.getPerWin() == null) { + return Result.failure("所有字段都必须填写"); + } + + Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class); + + grade.setCreateTime(new Date()); + grade.setUpdateTime(new Date()); + + if (!adminGradeService.save(grade)) return Result.failure("新增失败"); + + return Result.success(); + } + + + @PutMapping("/update") + public Result update(@RequestBody GradeDto gradeDto){ + + if (gradeDto.getGradeName() == null || gradeDto.getAmount() == null|| + gradeDto.getSort() == null || gradeDto.getPerWin() == null) { + return Result.failure("所有字段都必须填写"); + } + + LOGGER.info("修改等级：{}", gradeDto); + if (adminGradeService.getById(gradeDto.getId())== null) { + return Result.failure("修改的id不存在"); + } + + Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class); + grade.setUpdateTime(new Date()); + + if (!adminGradeService.updateById(grade)) return Result.failure("修改失败"); + return Result.success(); + } + + + @DeleteMapping("/delete") + public Result delete(@RequestParam Long id){ + LOGGER.info("删除id为：{} 的等级" ,id); + if (!adminGradeService.removeById(id)){ + return Result.failure("删除失败"); + } + return Result.success(); + } + +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/AdminGradeMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/AdminGradeMapper.java new file mode 100644 index 0000000..b0ffb50 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/AdminGradeMapper.java @@ -0,0 +1,18 @@ +package com.lottery.admin.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-14 14:37 + * @Version 1.0 + **/ + +@Mapper +public interface AdminGradeMapper extends BaseMapper { +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminGradeService.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminGradeService.java new file mode 100644 index 0000000..1b9b61a --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminGradeService.java @@ -0,0 +1,21 @@ +package com.lottery.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lottery.dto.GradeDto; +import com.lottery.entity.Grade; +import org.springframework.stereotype.Service; + +/** + * @program: lottery-system + * @ClassName IGradeService + * @description: + * @author: wwl + * @create: 2025-07-14 14:40 + * @Version 1.0 + **/ + + +public interface AdminGradeService extends IService { + +// boolean updateGrade(GradeDto gradeDto); +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java new file mode 100644 index 0000000..a5a3d72 --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java @@ -0,0 +1,42 @@ +package com.lottery.admin.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lottery.admin.mapper.AdminGradeMapper; +import com.lottery.admin.service.AdminGradeService; +import com.lottery.dto.GradeDto; +import com.lottery.entity.Grade; +import com.lottery.exception.SomeException; +import com.lottery.result.Result; +import com.lottery.utils.ConvertBeanUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @program: lottery-system + * @ClassName GradeServiceImpl + * @description: + * @author: wwl + * @create: 2025-07-14 14:42 + * @Version 1.0 + **/ + +@Service +public class AdminGradeServiceImpl extends ServiceImpl implements AdminGradeService { + +// @Autowired +// private AdminGradeMapper adminGradeMapper; + + +// @Override +// public boolean updateGrade(GradeDto gradeDto) { +// +// Grade grade = ConvertBeanUtil.convert(gradeDto,Grade.class); +// grade.setUpdateTime(new Date()); +// if (!(adminGradeMapper.updateById(grade) > 0)) { +// return false; +// } +// return true; + // } +} 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 index 6644b28..729ad00 100644 --- 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 @@ -33,12 +33,13 @@ public class PrizeController { private final static Logger LOGGER = LoggerFactory.getLogger(PrizeController.class); @GetMapping("/list") - public Result> getAllPrize(){ + public Result> getAllPrizeAnd(){ LOGGER.info("查询所有礼品和对应等级，按照sort值排序"); - List list = prizeService.list(); +// List list = prizeService.list(); - List l = prizeService.getAllPrizeAndGrade(); - return Result.success(ConvertBeanUtil.convertList(list,PrizeVo.class)); + List list = prizeService.getAllPrizeAndGrade(); + + return Result.success(list); } } 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 index fbc7610..9ae58df 100644 --- 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 @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; * @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/service/Impl/GradeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/GradeServiceImpl.java index 19e22db..9721c1a 100644 --- 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 @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; * @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 16b026f..0ecf407 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 @@ -36,8 +36,6 @@ public class PrizeServiceImpl extends ServiceImpl implement @Override public List getAllPrizeAndGrade() { - PrizeAndGradeVo prizeAndGradeVo = new PrizeAndGradeVo(); - return prizeMapper.selectPrizeAndGrade(); } } diff --git a/lottery-system/lottery-service/src/main/resources/mapper/admin/AdminGradeMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/admin/AdminGradeMapper.xml new file mode 100644 index 0000000..601dd33 --- /dev/null +++ b/lottery-system/lottery-service/src/main/resources/mapper/admin/AdminGradeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/api/gradeMapper.xml similarity index 100% rename from lottery-system/lottery-service/src/main/resources/mapper/gradeMapper.xml rename to lottery-system/lottery-service/src/main/resources/mapper/api/gradeMapper.xml diff --git a/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/api/prizeMapper.xml similarity index 62% rename from lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml rename to lottery-system/lottery-service/src/main/resources/mapper/api/prizeMapper.xml index 8962843..dd72444 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/api/prizeMapper.xml @@ -3,7 +3,9 @@ \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/api/userMapper.xml similarity index 100% rename from lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml rename to lottery-system/lottery-service/src/main/resources/mapper/api/userMapper.xml