From 126268aa6a13cdb300b7479651dc19afc87f632a Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 13:50:48 +0800 Subject: [PATCH] zh --- .../controller/manage/AdminController.java | 17 ++++++---- .../manage/RewardRuleTemplateController.java | 6 ++++ .../manage/TopicActivityController.java | 34 ++++++++++++++++++- .../controller/wxApp/RankController.java | 4 +-- .../wxApp/TopicActivityUController.java | 8 ++++- .../project0512/mapper/RewardRuleMapper.java | 2 +- .../java/com/zh/project0512/model/Admin.java | 1 + .../com/zh/project0512/model/RewardRule.java | 17 +++------- .../zh/project0512/model/TopicActivity.java | 7 ++++ .../java/com/zh/project0512/model/Video.java | 2 +- .../mapper/RewardRuleTemplateMapper.xml | 7 ++-- 11 files changed, 77 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/AdminController.java b/src/main/java/com/zh/project0512/controller/manage/AdminController.java index d5692d3..d2c5dee 100644 --- a/src/main/java/com/zh/project0512/controller/manage/AdminController.java +++ b/src/main/java/com/zh/project0512/controller/manage/AdminController.java @@ -59,18 +59,18 @@ public class AdminController { String name = param.getName(); String password = param.getPassword(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("name",name); + qw.eq("name", name); Admin admin = adminService.getOne(qw); - if(null == admin){ + if (null == admin) { return Result.fail(HttpStatusEnum.USER_NOT_EXIST, "未注册！"); } - if(!password.equals(admin.getPassword())){ + if (!password.equals(admin.getPassword())) { return Result.fail(HttpStatusEnum.USER_NOT_EXIST, "密码错误！"); } String token = new JwtUtil().createAdminJWT(admin.getId().toString()); admin.setToken(token).setLastLoginAt(LocalDateTime.now()); UpdateWrapper uw = new UpdateWrapper<>(); - uw.eq("id",admin.getId()).set("token",token).set("lastLoginAt",LocalDateTime.now()); + uw.eq("id", admin.getId()).set("token", token).set("lastLoginAt", LocalDateTime.now()); adminService.update(uw); return Result.success(admin); } @@ -94,8 +94,13 @@ public class AdminController { @PostMapping("register") @adminTokenValid public Result register(@Validated @RequestBody registerParam param) { - Admin admin = new Admin().setName(param.getName()).setPassword(param.getPassword()).setRealName(param.getRealName()).setCreatAt(LocalDateTime.now()); - adminService.save(admin); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("name", param.getName()); + if (null != adminService.getOne(qw)) { + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "已注册！"); + } + Admin admin = new Admin().setName(param.getName()).setPassword(param.getPassword()).setTel(param.getTel()).setRealName(param.getRealName()).setCreatAt(LocalDateTime.now()); + adminService.save(admin); return Result.success(admin); } diff --git a/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java b/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java index 772308f..014c51d 100644 --- a/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java +++ b/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java @@ -30,6 +30,9 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -67,6 +70,9 @@ public class RewardRuleTemplateController { @adminTokenValid @Transactional public Result add(@Validated @RequestBody AddRRTParam param) { + List rr = Arrays.asList(param.getRewardRuleList()); + rr.sort(Comparator.comparing(RewardRule::getLimitNum)); + System.out.println(rr); RewardRuleTemplate rewardRuleTemplate = new RewardRuleTemplate(); rewardRuleTemplate.setTitle(param.getTitle()).setCreatAt(LocalDateTime.now()); rewardRuleTemplateService.save(rewardRuleTemplate); diff --git a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java index 65aa51c..9903751 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java @@ -2,8 +2,11 @@ package com.zh.project0512.controller.manage; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zh.project0512.annotation.adminTokenValid; import com.zh.project0512.model.TopicActivity; +import com.zh.project0512.model.UserAccount; import com.zh.project0512.service.ITopicActivityService; import com.zh.project0512.utils.MybatisPlusUtil; import com.zh.project0512.utils.result.HttpStatusEnum; @@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @@ -103,7 +107,12 @@ public class TopicActivityController { @PostMapping("/list") @adminTokenValid public Result list(@RequestBody(required = false) JSONObject obj) { - return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetPage(obj))); + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByDesc("updateAt","creatAt"); + if(obj.getBoolean("showAtIndex") !=null && obj.getBoolean("showAtIndex") == true){ + qw.eq("showAtIndex",1); + } + return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } @Data @@ -122,4 +131,27 @@ public class TopicActivityController { TopicActivity topicActivity = topicActivityService.getById(id); return topicActivity != null ? Result.success(topicActivity) : Result.fail(HttpStatusEnum.NOT_FOUND); } + + @Data + static class showAtIndexParam { + @NotNull(message = "id不能为空") + @Min(value = 1, message = "id最小值为1") + @Schema(title = "动态id") + private Integer id; + @NotNull(message = "showAtIndex不能为空") + @Min(value = 0, message = "取值是：0否；1是") + @Max(value = 1, message = "取值是：0否；1是") + @Schema(title = "是否首页显示",description = "0否；1是") + private Integer showAtIndex; + } + + @Operation(summary = "修改动态是否首页显示") + @PostMapping("/showAtIndex") + @adminTokenValid + public Result showAtIndex(@Validated @RequestBody showAtIndexParam param) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", param.getId()).set("showAtIndex",param.getShowAtIndex()); + return MybatisPlusUtil.sqlResult(topicActivityService.update(updateWrapper),"编辑"); + } + } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/RankController.java b/src/main/java/com/zh/project0512/controller/wxApp/RankController.java index c259341..fa95f68 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/RankController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/RankController.java @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** - * 首页排行榜 + * 排行榜 */ -@Tag(name = "首页") +@Tag(name = "排行榜") @RestController @RequestMapping("/wxApp/rank") public class RankController { diff --git a/src/main/java/com/zh/project0512/controller/wxApp/TopicActivityUController.java b/src/main/java/com/zh/project0512/controller/wxApp/TopicActivityUController.java index eeca889..505c99f 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/TopicActivityUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/TopicActivityUController.java @@ -2,6 +2,7 @@ package com.zh.project0512.controller.wxApp; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zh.project0512.model.TopicActivity; import com.zh.project0512.service.ITopicActivityService; @@ -41,7 +42,12 @@ public class TopicActivityUController { @Operation(summary = "动态列表") @PostMapping("/list") public Result list(@RequestBody(required = false) JSONObject obj) { - return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetPage(obj))); + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByDesc("updateAt","creatAt"); + if(obj.getBoolean("showAtIndex") !=null && obj.getBoolean("showAtIndex") == true){ + qw.eq("showAtIndex",1); + } + return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } @Data diff --git a/src/main/java/com/zh/project0512/mapper/RewardRuleMapper.java b/src/main/java/com/zh/project0512/mapper/RewardRuleMapper.java index 416acb4..5913f23 100644 --- a/src/main/java/com/zh/project0512/mapper/RewardRuleMapper.java +++ b/src/main/java/com/zh/project0512/mapper/RewardRuleMapper.java @@ -20,7 +20,7 @@ public interface RewardRuleMapper extends BaseMapper { @Insert("") void addGroup(int id,RewardRule[] arr); diff --git a/src/main/java/com/zh/project0512/model/Admin.java b/src/main/java/com/zh/project0512/model/Admin.java index d542d21..a82ab41 100644 --- a/src/main/java/com/zh/project0512/model/Admin.java +++ b/src/main/java/com/zh/project0512/model/Admin.java @@ -47,6 +47,7 @@ public class Admin extends Model { /** * 真实名称 */ + @TableField("realName") private String realName; /** * 用户类型：1.平台超级管理员，2.平台普通管理员 diff --git a/src/main/java/com/zh/project0512/model/RewardRule.java b/src/main/java/com/zh/project0512/model/RewardRule.java index 203471e..b43fd04 100644 --- a/src/main/java/com/zh/project0512/model/RewardRule.java +++ b/src/main/java/com/zh/project0512/model/RewardRule.java @@ -53,20 +53,13 @@ public class RewardRule extends Model { private Integer templateId; /** - * 最大值 + * 临界值 */ - @Schema(title = "最大值") - @NotNull(message = "max不能为空") - @Min(value = 1,message = "max不能等于0") - private Integer max; + @Schema(title = "limitNum") + @NotNull(message = "临界值不能为空") + @Min(value = 1,message = "临界值不能小于1") + private Integer limitNum; - /** - * 最小值 - */ - @Schema(title = "最小值") - @NotNull(message = "min不能为空") - @Min(value = 0,message = "min不能小于0") - private Integer min; /** * 创建时间 diff --git a/src/main/java/com/zh/project0512/model/TopicActivity.java b/src/main/java/com/zh/project0512/model/TopicActivity.java index 8bebf9f..37827cd 100644 --- a/src/main/java/com/zh/project0512/model/TopicActivity.java +++ b/src/main/java/com/zh/project0512/model/TopicActivity.java @@ -60,6 +60,13 @@ public class TopicActivity extends Model { @TableField("playNum") private Integer playNum; + /** + * 首页展示：1是；0否 + */ + @Schema(title = "首页展示：1是；0否") + @TableField("showAtIndex") + private Integer showAtIndex; + @TableField("creatAt") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime creatAt; diff --git a/src/main/java/com/zh/project0512/model/Video.java b/src/main/java/com/zh/project0512/model/Video.java index 6d031d8..ef1f190 100644 --- a/src/main/java/com/zh/project0512/model/Video.java +++ b/src/main/java/com/zh/project0512/model/Video.java @@ -88,7 +88,7 @@ public class Video extends Model { private Integer reSendNum; /** - * 推荐量 + * 推荐次数 */ @TableField("recommendNum") private Integer recommendNum; diff --git a/src/main/resources/mapper/RewardRuleTemplateMapper.xml b/src/main/resources/mapper/RewardRuleTemplateMapper.xml index 01fb390..c5b800b 100644 --- a/src/main/resources/mapper/RewardRuleTemplateMapper.xml +++ b/src/main/resources/mapper/RewardRuleTemplateMapper.xml @@ -25,12 +25,11 @@ - - +