From 8b74664d42c8cc6948bfa8cea05fc4a3478f039a Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Tue, 28 Jun 2022 18:10:08 +0800 Subject: [PATCH] zh --- .../wxApp/TeachingRefeUController.java | 42 +++++++++++++++++++ .../controller/wxApp/UserTaskUController.java | 26 +----------- 2 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/zh/project0512/controller/wxApp/TeachingRefeUController.java diff --git a/src/main/java/com/zh/project0512/controller/wxApp/TeachingRefeUController.java b/src/main/java/com/zh/project0512/controller/wxApp/TeachingRefeUController.java new file mode 100644 index 0000000..bfd92be --- /dev/null +++ b/src/main/java/com/zh/project0512/controller/wxApp/TeachingRefeUController.java @@ -0,0 +1,42 @@ +package com.zh.project0512.controller.wxApp; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zh.project0512.annotation.AdminTokenValid; +import com.zh.project0512.model.TeachingRefe; +import com.zh.project0512.service.ITeachingRefeService; +import com.zh.project0512.utils.MybatisPlusUtil; +import com.zh.project0512.utils.result.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/wxApp/teachingRefe") +@Tag(name = "通用教程") +public class TeachingRefeUController { + @Autowired + private ITeachingRefeService teachingRefeService; + @Data + static class listTCRParam { + private Integer pageNum; + private Integer pageSize; + @Schema(title = "教程名称") + private String title; + } + + @Operation(summary = "列表") + @PostMapping("/list") + @AdminTokenValid + public Result list(@Validated @RequestBody listTCRParam param) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("isDeleted",0).orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle()); + return Result.success(teachingRefeService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); + } +} diff --git a/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java b/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java index ead8e93..6eab911 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java @@ -2,17 +2,12 @@ package com.zh.project0512.controller.wxApp; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.annotation.TokenValid; -import com.zh.project0512.controller.manage.TeachingRefeController; -import com.zh.project0512.model.TeachingRefe; import com.zh.project0512.model.UserTask; import com.zh.project0512.service.ITaskService; -import com.zh.project0512.service.ITeachingRefeService; import com.zh.project0512.service.IUserService; import com.zh.project0512.service.IUserTaskService; import com.zh.project0512.utils.JwtUtil; -import com.zh.project0512.utils.MybatisPlusUtil; import com.zh.project0512.utils.result.HttpStatusEnum; import com.zh.project0512.utils.result.Result; import io.swagger.v3.oas.annotations.Operation; @@ -45,8 +40,7 @@ public class UserTaskUController { private ITaskService taskService; @Autowired private IUserService userService; - @Autowired - private ITeachingRefeService teachingRefeService; + @Data static class AddUTParam { @Schema(title = "任务id") @@ -74,22 +68,4 @@ public class UserTaskUController { userTaskService.save(new UserTask().setUserId(userId).setTaskId(taskId)); return Result.success("添加完成"); } - - @Data - static class listTCRParam { - private Integer pageNum; - private Integer pageSize; - @Schema(title = "教程名称") - private String title; - } - - @Operation(summary = "列表") - @PostMapping("/list") - @AdminTokenValid - public Result list(@Validated @RequestBody listTCRParam param) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("isDeleted",0).orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle()); - return Result.success(teachingRefeService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); - } - }