zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -165,20 +165,7 @@ public class UtilsController {
     @PostMapping("/test")
     @ResponseBody
     public Result test() {
-        //获取员工排名进排名数据库
-        QueryWrapper<RankListDTO> 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<RankListVo> rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper);
-        ArrayList<Rank> 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();
     }
 
 }

src/main/java/com/zh/project0512/controller/manage/RankController.java

@@ -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), "请求成功");
-    }
-
-}

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<User> 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);

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:

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;
 
 /**
  * <p>
@@ -12,5 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2022-06-30
  */
 public interface UserEffectRecordsMapper extends BaseMapper<UserEffectRecords> {
-
+    @Select("INSERT into userEffectRecords " +
+        "(userId,departmentId,effectResultTran,createAt) " +
+        " VALUES " +
+        "(#{userId},(SELECT main_department from user WHERE id  = #{userId}),#{effectResultTran},#{createAt})")
+    void saveEffectResult(UserEffectRecords userEffectRecords);
 }

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