Pārlūkot izejas kodu

1.问答相关完善,区分老师和学生端
2.课时以及章节的下拉接口

honorfire 7 mēneši atpakaļ
vecāks
revīzija
3c0fd297b3

+ 17 - 0
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterController.java

@@ -196,6 +196,23 @@ public class CourseChapterController {
         return CommonResult.data(chapterList);
     }
 
+    /**
+     * 课程章节表-下拉列表
+     *
+     * @author pans
+     * @date  2025/07/02 15:34
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("课程章节表-下拉列表")
+    @GetMapping("/disk/chapter/downList")
+    public CommonResult<List<Chapter>> downList(ChapterPageParam chapterPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("courseId", req.getParameter("courseId"));
+        param.put("name", req.getParameter("name"));
+        List<Chapter> chapterList=chapterService.wrapperList(param);
+        return CommonResult.data(chapterList);
+    }
+
     /**
      * 添加课程章节表
      *

+ 20 - 4
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseClassHourController.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo.disk.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,10 +31,7 @@ import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.disk.domain.*;
-import vip.xiaonuo.disk.param.ClassHourAddParam;
-import vip.xiaonuo.disk.param.ClassHourEditParam;
-import vip.xiaonuo.disk.param.ClassHourIdParam;
-import vip.xiaonuo.disk.param.ClassHourPageParam;
+import vip.xiaonuo.disk.param.*;
 import vip.xiaonuo.disk.param.courseclasshourfilerelate.CourseRelateIdParam;
 import vip.xiaonuo.disk.service.ChapterService;
 import vip.xiaonuo.disk.service.ClassHourService;
@@ -86,6 +85,23 @@ public class CourseClassHourController {
         return CommonResult.data(page);
     }
 
+    /**
+     * 课时-下拉列表
+     *
+     * @author pans
+     * @date  2025/07/02 15:34
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("课时-下拉列表")
+    @GetMapping("/disk/hour/downList")
+    public CommonResult<List<ClassHour>> downList(ChapterPageParam chapterPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("chapterId", req.getParameter("chapterId"));
+        param.put("name", req.getParameter("name"));
+        List<ClassHour> hourList=classHourService.wrapperList(param);
+        return CommonResult.data(hourList);
+    }
+
     /**
      * 添加课时表
      *

+ 5 - 0
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseQuestionAnswerController.java

@@ -88,6 +88,10 @@ public class CourseQuestionAnswerController {
         param.put("userId", StpLoginUserUtil.getLoginUser().getId());
         //是否是查父级评论,0否1是
         param.put("isPid", "1");
+        //教育身份,0管理员1老师2学生,默认是学生
+        String eduIdentity="2";
+        if(StringUtils.isNotEmpty(req.getParameter("eduIdentity")))eduIdentity=req.getParameter("eduIdentity");
+        param.put("eduIdentity", eduIdentity);
         //查询一级评论问题
         Page<Map<String,Object>> page=questionAnswerService.queryList(param);
         List<Map<String,Object>> recordList=page.getRecords();
@@ -122,6 +126,7 @@ public class CourseQuestionAnswerController {
         return CommonResult.data(page);
     }
 
+
     /**
      * 添加课程问答
      *

+ 1 - 1
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/TestWebSocket.java

@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Slf4j
 @Component
-@ServerEndpoint("/test/auto")
+@ServerEndpoint("/webSocket/auto/111")
 public class TestWebSocket {
 
     private Session session;

+ 6 - 1
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/QuestionAnswerMapper.xml

@@ -66,7 +66,12 @@
             and cqa.COURSE_ID=#{param.courseId}
         </if>
         <if test="param.userId !=null and param.userId != ''">
-            and cqa.USER_ID=#{param.userId}
+            <if test="param.eduIdentity ==2">
+                and cqa.USER_ID=#{param.userId}
+            </if>
+            <if test="param.eduIdentity ==1">
+                and ci.TEACHER_ID=#{param.userId}
+            </if>
         </if>
         <if test="param.hourId !=null and param.hourId != ''">
             and cr.MAIN_ID=#{param.hourId}