Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterKnowledgeController.java

@@ -12,7 +12,6 @@
  */
 package vip.xiaonuo.disk.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -42,7 +41,7 @@ import java.util.Map;
  * @author pans
  * @date  2025/08/04 17:14
  */
-@Api(tags = "COURSE_CHAPTER_KNOWLEDGE控制器")
+@Api(tags = "作业相关")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
 @Validated
@@ -58,8 +57,7 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 1)
-    @ApiOperation("获取COURSE_CHAPTER_KNOWLEDGE分页")
-    @SaCheckPermission("/disk/chapterknowledge/page")
+    @ApiOperation("知识点列表")
     @GetMapping("/disk/chapterknowledge/page")
     public CommonResult<Page<CourseChapterKnowledge>> page(CourseChapterKnowledgePageParam courseChapterKnowledgePageParam) {
         return CommonResult.data(courseChapterKnowledgeService.page(courseChapterKnowledgePageParam));
@@ -72,9 +70,8 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 2)
-    @ApiOperation("添加COURSE_CHAPTER_KNOWLEDGE")
+    @ApiOperation("添加知识点")
     @CommonLog("添加COURSE_CHAPTER_KNOWLEDGE")
-    @SaCheckPermission("/disk/chapterknowledge/add")
     @PostMapping("/disk/chapterknowledge/add")
     public CommonResult<String> add(@RequestBody @Valid CourseChapterKnowledgeAddParam courseChapterKnowledgeAddParam) {
         courseChapterKnowledgeService.add(courseChapterKnowledgeAddParam);
@@ -88,9 +85,8 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 3)
-    @ApiOperation("编辑COURSE_CHAPTER_KNOWLEDGE")
+    @ApiOperation("编辑知识点")
     @CommonLog("编辑COURSE_CHAPTER_KNOWLEDGE")
-    @SaCheckPermission("/disk/chapterknowledge/edit")
     @PostMapping("/disk/chapterknowledge/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseChapterKnowledgeEditParam courseChapterKnowledgeEditParam) {
         courseChapterKnowledgeService.edit(courseChapterKnowledgeEditParam);
@@ -104,9 +100,8 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 4)
-    @ApiOperation("删除COURSE_CHAPTER_KNOWLEDGE")
+    @ApiOperation("删除知识点")
     @CommonLog("删除COURSE_CHAPTER_KNOWLEDGE")
-    @SaCheckPermission("/disk/chapterknowledge/delete")
     @PostMapping("/disk/chapterknowledge/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseChapterKnowledgeIdParam> courseChapterKnowledgeIdParamList) {
@@ -121,8 +116,7 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取COURSE_CHAPTER_KNOWLEDGE详情")
-    @SaCheckPermission("/disk/chapterknowledge/detail")
+    @ApiOperation("知识点详情")
     @GetMapping("/disk/chapterknowledge/detail")
     public CommonResult<CourseChapterKnowledge> detail(@Valid CourseChapterKnowledgeIdParam courseChapterKnowledgeIdParam) {
         return CommonResult.data(courseChapterKnowledgeService.detail(courseChapterKnowledgeIdParam));
@@ -137,7 +131,7 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取COURSE_CHAPTER_KNOWLEDGE详情")
+    @ApiOperation("作业个人完成比例")
     @GetMapping("/disk/chapterknowledge/selectKnowledgeByCourseId")
     public CommonResult<List<Map<String,Object>>> selectKnowledgeByCourseId(@RequestParam(name = "courseId", required = true) String courseId) {
         return CommonResult.data(courseChapterKnowledgeService.selectKnowledgeByCourseId(courseId));
@@ -152,7 +146,7 @@ public class CourseChapterKnowledgeController {
      * @date  2025/08/04 17:14
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取COURSE_CHAPTER_KNOWLEDGE详情")
+    @ApiOperation("班级人均完成比例")
     @GetMapping("/disk/chapterknowledge/selectKnowledgeListByCourseId")
     public CommonResult<List<Map<String,Object>>> selectKnowledgeListByCourseId(@RequestParam(name = "courseId", required = true) String courseId,@RequestParam(name = "knowledgeId", required = true) String knowledgeId) {
         return CommonResult.data(courseChapterKnowledgeService.selectKnowledgeListByCourseId(courseId,knowledgeId));

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseOpenMapper.xml

@@ -93,7 +93,7 @@
                 LEFT JOIN COURSE_INFO b ON
                 a.COURSE_ID = b.COURSE_ID
         WHERE
-            a.SEMESTER_ID = #{semesterId}
+            a.SEMESTER_ID = #{semesterId} AND  b.PUTAWAY_STATUS=1
         ORDER BY
             a.id
     </select>

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/admin/TExamController.java

@@ -43,7 +43,7 @@ import java.util.List;
  * @author ZSS
  * @date  2025/07/22 10:51
  */
-@Api(tags = "教师端考试表控制器")
+@Api(tags = "作业相关")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController("AdminTExamController")
 @Validated
@@ -60,7 +60,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 1)
-    @ApiOperation("获取考试表分页")
+    @ApiOperation("作业名称")
     @SaCheckPermission("/api/admin/t_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExamVo>> page(TExamPageParam tExamPageParam) {
@@ -74,7 +74,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 2)
-    @ApiOperation("添加考试表")
+    @ApiOperation("添加作业")
     @CommonLog("添加考试表")
     @SaCheckPermission("/api/admin/t_exam/add")
     @PostMapping("/add")
@@ -90,7 +90,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 3)
-    @ApiOperation("编辑考试表")
+    @ApiOperation("修改作业")
     @CommonLog("编辑考试表")
     @SaCheckPermission("/api/admin/t_exam/edit")
     @PostMapping("/edit")
@@ -106,7 +106,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 4)
-    @ApiOperation("删除考试表")
+    @ApiOperation("删除作业")
     @CommonLog("删除考试表")
     @SaCheckPermission("/api/admin/t_exam/delete")
     @PostMapping("/delete")
@@ -123,7 +123,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取考试表详情")
+    @ApiOperation("作业详情")
     @SaCheckPermission("/api/admin/t_exam/detail")
     @GetMapping("/detail")
     public CommonResult<TExamVo> detail(@Valid TExamIdParam tExamIdParam) {

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/ExamPaperAnswerController.java

@@ -2,6 +2,10 @@ package vip.xiaonuo.exam.controller.student;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -34,7 +38,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+@Api(tags = "作业相关")
+@ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController("StudentExamPaperAnswerController")
 @RequestMapping(value = "/api/student/exampaper/answer")
 public class ExamPaperAnswerController extends BaseApiController {
@@ -73,8 +78,8 @@ public class ExamPaperAnswerController extends BaseApiController {
         });
         return CommonResult.data(pageInfo);
     }
-
-
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("提交次数")
     @RequestMapping(value = "/answerSubmit", method = RequestMethod.POST)
     public CommonResult<String> answerSubmit(@RequestBody @Valid ExamPaperSubmitVM examPaperSubmitVM) {
         SaBaseLoginUser user = getCurrentUser();
@@ -94,8 +99,8 @@ public class ExamPaperAnswerController extends BaseApiController {
         eventPublisher.publishEvent(new UserEvent(userEventLog));
         return CommonResult.data(scoreVm);
     }
-
-
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("每次提交的分数")
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     public CommonResult<String> edit(@RequestBody @Valid ExamPaperSubmitVM examPaperSubmitVM) {
         boolean notJudge = examPaperSubmitVM.getAnswerItems().stream().anyMatch(i -> i.getDoRight() == null && i.getScore() == null);
@@ -116,7 +121,8 @@ public class ExamPaperAnswerController extends BaseApiController {
         eventPublisher.publishEvent(new UserEvent(userEventLog));
         return CommonResult.data(score);
     }
-
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("每次提交的错题")
     @RequestMapping(value = "/read/{id}", method = RequestMethod.POST)
     public CommonResult<ExamPaperReadVM> read(@PathVariable Integer id) {
         ExamPaperAnswer examPaperAnswer = examPaperAnswerService.selectById(id);

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/TExamController.java

@@ -38,7 +38,7 @@ import javax.validation.Valid;
  * @author ZSS
  * @date  2025/07/22 10:51
  */
-@Api(tags = "学生端考试表控制器")
+@Api(tags = "作业相关")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController("StudentTExamController")
 @Validated
@@ -55,7 +55,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 1)
-    @ApiOperation("获取考试表分页")
+    @ApiOperation("每个错题的错误选项与对应发生的比例")
     @SaCheckPermission("/api/admin/s_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExamVo>> page(TExamPageParam tExamPageParam) {
@@ -69,7 +69,7 @@ public class TExamController extends BaseApiController {
      * @date  2025/07/22 10:51
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取考试表详情")
+    @ApiOperation("班级人均完成比例")
     @SaCheckPermission("/api/admin/s_exam/detail")
     @GetMapping("/detail")
     public CommonResult<TExamVo> detail(@Valid TExamIdParam tExamIdParam) {

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/domain/TExam.java

@@ -98,7 +98,8 @@ public class TExam {
     private String semesterId;
     @ApiModelProperty(value = "课程id", position = 15)
     private String courseId;
-
+    @ApiModelProperty(value = "课时ID", position = 14)
+    private String hourId;
 
 
 }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/domain/exam/TExamEditParam.java

@@ -84,6 +84,7 @@ public class TExamEditParam {
 
     private String examType;
 
-
+    @ApiModelProperty(value = "课时ID", position = 14)
+    private String hourId;
 
 }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -84,6 +84,8 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
     private CourseOpenMapper courseOpenMapper;
 
 
+
+
     @Override
     public Page<TExamVo> page(TExamPageParam tExamPageParam) {
         if(!StpLoginUserUtil.getLoginUser().getAccount().equals("superAdmin")){
@@ -139,15 +141,6 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
             }
         }
 
-//        if(tExam.getExamType() == null){
-//            if(examPaper.getPaperType() == ExamPaperTypeEnum.Survey.getCode()){
-//                tExam.setExamType("3"); // 调查问卷
-//            }else if(tExamAddParam.getChapterId() != null){
-//                tExam.setExamType("2"); // 章节测验
-//            }else{
-//                tExam.setExamType("1"); // 普通考试
-//            }
-//        }
 
         tExam.setExamType(tExamAddParam.getExamType());
         this.save(tExam);