diff --git a/src/main/java/com/zh/project0512/controller/manage/QYWXController.java b/src/main/java/com/zh/project0512/controller/manage/QYWXController.java index 59daad8..05ddc19 100644 --- a/src/main/java/com/zh/project0512/controller/manage/QYWXController.java +++ b/src/main/java/com/zh/project0512/controller/manage/QYWXController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; 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.annotation.tokenValid; import com.zh.project0512.model.QywxDepartmentUserLink; import com.zh.project0512.model.User; @@ -35,6 +36,7 @@ public class QYWXController { @Operation(summary = "刷新企业部门信息") @PostMapping("/departmentRefresh") + @adminTokenValid public Result departmentRefresh() { String access_token = httpUtil.qywxGetToken(); JSONObject res = httpUtil.qywxDepartmentList(access_token); diff --git a/src/main/java/com/zh/project0512/controller/manage/RankUController.java b/src/main/java/com/zh/project0512/controller/manage/RankUController.java new file mode 100644 index 0000000..4de4734 --- /dev/null +++ b/src/main/java/com/zh/project0512/controller/manage/RankUController.java @@ -0,0 +1,43 @@ +package com.zh.project0512.controller.manage; + +import com.zh.project0512.annotation.adminTokenValid; +import com.zh.project0512.annotation.tokenValid; +import com.zh.project0512.model.dto.RankListDTO; +import com.zh.project0512.service.IRankService; +import com.zh.project0512.service.IVideoService; +import com.zh.project0512.utils.JwtUtil; +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 RankUController { + @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/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 035ee80..f6c4719 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -383,4 +383,3 @@ public class TaskController { return Result.success(iPage); } } - diff --git a/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java b/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java index a847a5e..100e3be 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.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.zh.project0512.model.Brand; import com.zh.project0512.service.IBrandService; import com.zh.project0512.utils.MybatisPlusUtil; @@ -40,6 +41,8 @@ public class BrandUController { @Operation(summary = "品牌列表") @PostMapping("/list") public Result list(@RequestBody(required = false) @Parameter(hidden = true) JSONObject obj) { - return Result.success(brandService.pageMaps(MybatisPlusUtil.SetPage(obj))); + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); + return Result.success(brandService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java b/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java index 5ed3b99..8cb629a 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/TagUController.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.zh.project0512.model.Tag; import com.zh.project0512.service.ITagService; import com.zh.project0512.utils.MybatisPlusUtil; @@ -39,6 +40,8 @@ public class TagUController { @Operation(summary = "标签列表") @PostMapping("/list") public Result list(@RequestBody(required = false) JSONObject obj) { - return Result.success(tagService.pageMaps(MybatisPlusUtil.SetPage(obj))); + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); + return Result.success(tagService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } }