From fabe90aa21c3324fd0856db923b8b2473d3663d6 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Thu, 30 Jun 2022 13:56:32 +0800 Subject: [PATCH] zh --- .../controller/UtilsController.java | 15 +------ .../controller/manage/RankController.java | 41 ------------------- .../controller/manage/UserController.java | 6 +-- .../controller/manage/VideoController.java | 5 ++- .../mapper/UserEffectRecordsMapper.java | 7 +++- .../project0512/model/UserEffectRecords.java | 6 ++- 6 files changed, 18 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/com/zh/project0512/controller/manage/RankController.java diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index a9a688d..640e7ff 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -165,20 +165,7 @@ public class UtilsController { @PostMapping("/test") @ResponseBody public Result test() { - //获取员工排名进排名数据库 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("date_format(v.creatAt, '%Y-%m')", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); - queryWrapper.groupBy("u.id"); - queryWrapper.orderByDesc("value"); - List rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper); - ArrayList list = new ArrayList<>(); - if (rankUserList != null && rankUserList.size() > 0) { - for (RankListVo e : rankUserList) { - new Rank().setTitle(e.getTitle()).setSubtitle(e.getSubtitle()).setLinkId(e.getLinkId()).setValue(e.getValue()).setCreateDate(LocalDateTime.now()); -// list.add(); - } - } - return Result.success(rankUserList); + return Result.success(); } } diff --git a/src/main/java/com/zh/project0512/controller/manage/RankController.java b/src/main/java/com/zh/project0512/controller/manage/RankController.java deleted file mode 100644 index 70bbf8d..0000000 --- a/src/main/java/com/zh/project0512/controller/manage/RankController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zh.project0512.controller.manage; - -import com.zh.project0512.annotation.AdminTokenValid; -import com.zh.project0512.model.dto.RankListDTO; -import com.zh.project0512.service.IRankService; -import com.zh.project0512.service.IVideoService; -import com.zh.project0512.utils.result.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 排行榜 - */ -@Tag(name = "排行榜") -@RestController -@RequestMapping("/manage/rank") -public class RankController { - @Resource - IRankService rankService; - @Autowired - private IVideoService videoService; - - /** - * 查询排行榜列表 - * - * @param rankListDTO 排行列表DTO - * @return 排行榜列表 - */ - @Operation(summary = "排行列表") - @PostMapping("/list") - @AdminTokenValid - public Result rankList(@Validated @RequestBody RankListDTO rankListDTO) { - return Result.success(rankService.rankList(rankListDTO), "请求成功"); - } - -} diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java index 5b19f48..cfabdd8 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java @@ -151,14 +151,14 @@ public class UserController { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到用户"); } Integer pointsCur = user.getPoints(); - if (pointsCur < points) { - return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "积分不足"); - } UpdateWrapper up = new UpdateWrapper<>(); up.eq("id", userId); if (settlementMethod == 1) { up.set("points", pointsCur + points).set("historyPoints", user.getHistoryPoints() + points); } else if (settlementMethod == 2) { + if (pointsCur < points) { + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "积分不足"); + } up.set("points", pointsCur - points); } userService.update(up); diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java index 45e5c0d..d09f0fc 100644 --- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java +++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation; import com.zh.project0512.annotation.AdminTokenValid; +import com.zh.project0512.mapper.UserEffectRecordsMapper; import com.zh.project0512.model.AppMessage; import com.zh.project0512.model.UserEffectRecords; import com.zh.project0512.model.Video; @@ -52,7 +53,7 @@ public class VideoController { @Autowired private IVideoEffectSettingService videoEffectSettingService; @Autowired - private IUserEffectRecordsService userEffectRecordsService; + private UserEffectRecordsMapper userEffectRecordsMapper; @Data static class VParam { @@ -164,7 +165,7 @@ public class VideoController { up.set("effectResult", effectResult); up.set("updateAt", LocalDateTime.now()); videoService.update(up); - userEffectRecordsService.save(new UserEffectRecords().setUserId(video.getUserId()).setEffectResultTran(effectResult-originEffectResult).setCreateAt(LocalDateTime.now())); + userEffectRecordsMapper.saveEffectResult(new UserEffectRecords().setUserId(video.getUserId()).setEffectResultTran(effectResult-originEffectResult).setCreateAt(LocalDateTime.now())); String platForm = "未知平台"; switch (video.getType()) { case 1: diff --git a/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java b/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java index e4d366f..7d9b10c 100644 --- a/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java +++ b/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java @@ -2,6 +2,7 @@ package com.zh.project0512.mapper; import com.zh.project0512.model.UserEffectRecords; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; /** *

@@ -12,5 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2022-06-30 */ public interface UserEffectRecordsMapper extends BaseMapper { - + @Select("INSERT into userEffectRecords " + + "(userId,departmentId,effectResultTran,createAt) " + + " VALUES " + + "(#{userId},(SELECT main_department from user WHERE id = #{userId}),#{effectResultTran},#{createAt})") + void saveEffectResult(UserEffectRecords userEffectRecords); } diff --git a/src/main/java/com/zh/project0512/model/UserEffectRecords.java b/src/main/java/com/zh/project0512/model/UserEffectRecords.java index 35d1270..d3b6fca 100644 --- a/src/main/java/com/zh/project0512/model/UserEffectRecords.java +++ b/src/main/java/com/zh/project0512/model/UserEffectRecords.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; + import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +14,7 @@ import lombok.experimental.Accessors; /** *

- * + * *

* * @author zh @@ -32,6 +34,8 @@ public class UserEffectRecords extends Model { @TableField("userId") private Integer userId; + @TableField("departmentId") + private Integer departmentId; /** * 传播效果改变量 */