From 9b605265216f5757539c144e75b5850647f1e642 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Tue, 28 Jun 2022 17:37:22 +0800
Subject: [PATCH] zh

---
 Dockerfile.drone                              |  2 +-
 .../controller/wxApp/UserTaskUController.java | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.drone b/Dockerfile.drone
index 083f29f..71fc91a 100644
--- a/Dockerfile.drone
+++ b/Dockerfile.drone
@@ -1,4 +1,4 @@
-FROM harbor.oa00.com/library/openjdk:8-jdk-alpine
+FROM openjdk:8-jdk-alpine
 # 从编译阶段的中拷贝编译结果到当前镜像中
 COPY ./target/project0512-0.0.1-SNAPSHOT.jar /work/project0512-0.0.1-SNAPSHOT.jar
 WORKDIR /work
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 6eab911..ead8e93 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java
@@ -2,12 +2,17 @@ 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;
@@ -40,7 +45,8 @@ public class UserTaskUController {
     private ITaskService taskService;
     @Autowired
     private IUserService userService;
-
+    @Autowired
+    private ITeachingRefeService teachingRefeService;
     @Data
     static class AddUTParam {
         @Schema(title = "任务id")
@@ -68,4 +74,22 @@ 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<TeachingRefe> 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));
+    }
+
 }