1.功能开发-资源管理（课程资源审批）

2.功能开发-资源中心（课程管理）
3.一些bug修复

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

@@ -13,11 +13,13 @@
 package vip.xiaonuo.disk.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,15 +29,19 @@ import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.disk.domain.CourseAuditRecord;
+import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordAddParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordEditParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordIdParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordPageParam;
 import vip.xiaonuo.disk.service.CourseAuditRecordService;
+import vip.xiaonuo.disk.service.CourseInfoService;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.*;
 
 /**
  * 课程审核记录表控制器
@@ -52,6 +58,9 @@ public class CourseAuditRecordController {
     @Resource
     private CourseAuditRecordService courseAuditRecordService;
 
+    @Resource
+    private CourseInfoService courseInfoService;
+
     /**
      * 获取课程审核记录表分页
      *
@@ -62,23 +71,33 @@ public class CourseAuditRecordController {
     @ApiOperation("获取课程审核记录表分页")
     @SaCheckPermission("/disk/courseauditrecord/page")
     @GetMapping("/disk/courseauditrecord/page")
-    public CommonResult<Page<CourseAuditRecord>> page(CourseAuditRecordPageParam courseAuditRecordPageParam) {
-        return CommonResult.data(courseAuditRecordService.page(courseAuditRecordPageParam));
+    public CommonResult<Page<Map<String,Object>>> page(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        //默认不传情况，列表查询的是未审核的
+        String verifyStatus="0";
+        if(StringUtils.isNotEmpty(req.getParameter("verifyStatus")))verifyStatus=req.getParameter("verifyStatus");
+        param.put("verifyStatus", verifyStatus);
+        //文件名称
+        param.put("fileName", req.getParameter("fileName"));
+        Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
+        return CommonResult.data(list);
     }
 
     /**
-     * 添加课程审核记录表
+     * 课程审核记录表-添加
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 2)
-    @ApiOperation("添加课程审核记录表")
-    @CommonLog("添加课程审核记录表")
+    @ApiOperation("课程审核记录表-添加")
+    @CommonLog("课程审核记录表-添加")
     @SaCheckPermission("/disk/courseauditrecord/add")
     @PostMapping("/disk/courseauditrecord/add")
     public CommonResult<String> add(@RequestBody @Valid CourseAuditRecordAddParam courseAuditRecordAddParam) {
-        courseAuditRecordService.add(courseAuditRecordAddParam);
+        CourseAuditRecord courseAuditRecord = BeanUtil.toBean(courseAuditRecordAddParam, CourseAuditRecord.class);
+        courseAuditRecord.setVerifyStatus("0");
+        courseAuditRecordService.addOne(courseAuditRecord);
         return CommonResult.ok();
     }
 
@@ -94,7 +113,38 @@ public class CourseAuditRecordController {
     @SaCheckPermission("/disk/courseauditrecord/edit")
     @PostMapping("/disk/courseauditrecord/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
-        courseAuditRecordService.edit(courseAuditRecordEditParam);
+        CourseAuditRecord courseAuditRecord = BeanUtil.toBean(courseAuditRecordEditParam, CourseAuditRecord.class);
+        courseAuditRecordService.editOne(courseAuditRecord);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 课程审核记录-修改状态
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("课程审核记录-修改状态")
+    @CommonLog("课程审核记录-修改状态")
+    @SaCheckPermission("/disk/courseauditrecord/updateStatus")
+    @PostMapping("/disk/courseauditrecord/updateStatus")
+    public CommonResult<String> updateStatus(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
+        if(StringUtils.isEmpty(courseAuditRecordEditParam.getVerifyStatus()))return CommonResult.error("审核状态不能为空");
+        //0未发布，1待审核，2已发布，3未通过，4已删除
+        List<String> VerifyStatusList = Arrays.asList("1","2","3","4");
+        if(!VerifyStatusList.contains(courseAuditRecordEditParam.getVerifyStatus()))return CommonResult.error("审核状态错误");
+        //修改审核状态需要同步改变课程状态
+        //1.查回课程审核记录设置审核状态
+        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseAuditRecordEditParam.getId());
+        courseAuditRecord.setVerifyStatus(courseAuditRecordEditParam.getVerifyStatus());
+        courseAuditRecordService.editOne(courseAuditRecord);
+        //2.查回对应课程信息设置审核状态
+        CourseInfo courseInfo=courseInfoService.queryEntity(courseAuditRecord.getCourseId());
+        courseInfo.setVerifyStatus(courseAuditRecord.getVerifyStatus());
+        if("2".equals(courseAuditRecordEditParam.getVerifyStatus()))courseInfo.setPublishTime(new Date());
+        courseInfoService.editOne(courseInfo);
+
         return CommonResult.ok();
     }
 
@@ -125,8 +175,11 @@ public class CourseAuditRecordController {
     @ApiOperation("获取课程审核记录表详情")
     @SaCheckPermission("/disk/courseauditrecord/detail")
     @GetMapping("/disk/courseauditrecord/detail")
-    public CommonResult<CourseAuditRecord> detail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam) {
-        return CommonResult.data(courseAuditRecordService.detail(courseAuditRecordIdParam));
+    public CommonResult<Map<String,Object>> detail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("courseId", req.getParameter("courseId"));
+        Map<String,Object> result=courseAuditRecordService.queryInfo(param);
+        return CommonResult.data(result);
     }
 
 }

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

@@ -13,6 +13,7 @@
 package vip.xiaonuo.disk.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -23,19 +24,26 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.disk.domain.CourseAuditRecord;
 import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.dto.courseInfo.CourseInfoAddParam;
 import vip.xiaonuo.disk.dto.courseInfo.CourseInfoEditParam;
 import vip.xiaonuo.disk.dto.courseInfo.CourseInfoIdParam;
 import vip.xiaonuo.disk.dto.courseInfo.CourseInfoPageParam;
+import vip.xiaonuo.disk.service.CourseAuditRecordService;
 import vip.xiaonuo.disk.service.CourseInfoService;
+import vip.xiaonuo.sys.modular.user.entity.SysUser;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 课程信息表控制器
@@ -51,6 +59,8 @@ public class CourseInfoController {
 
     @Resource
     private CourseInfoService courseInfoService;
+    @Resource
+    private CourseAuditRecordService courseAuditRecordService;
 
     /**
      * 获取课程信息表分页
@@ -62,39 +72,63 @@ public class CourseInfoController {
     @ApiOperation("获取课程信息表分页")
     @SaCheckPermission("/disk/courseinfo/page")
     @GetMapping("/disk/courseinfo/page")
-    public CommonResult<Page<CourseInfo>> page(CourseInfoPageParam courseInfoPageParam) {
-        return CommonResult.data(courseInfoService.page(courseInfoPageParam));
+    public CommonResult<Page<Map<String,Object>>> page(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("courseName", req.getParameter("courseName"));
+        param.put("collegeId", req.getParameter("collegeId"));
+        param.put("majorId", req.getParameter("majorId"));
+        param.put("courseType", req.getParameter("courseType"));
+        Page<Map<String,Object>> list=courseInfoService.queryList(param);
+        return CommonResult.data(list);
     }
 
     /**
-     * 添加课程信息表
+     * 课程信息-添加
      *
      * @author honorfire
      * @date  2025/06/20 15:00
      */
     @ApiOperationSupport(order = 2)
-    @ApiOperation("添加课程信息表")
-    @CommonLog("添加课程信息表")
+    @ApiOperation("课程信息-添加")
+    @CommonLog("课程信息-添加")
     @SaCheckPermission("/disk/courseinfo/add")
     @PostMapping("/disk/courseinfo/add")
     public CommonResult<String> add(@RequestBody @Valid CourseInfoAddParam courseInfoAddParam) {
-        courseInfoService.add(courseInfoAddParam);
+        //1.先添加课程信息
+        CourseInfo courseInfo = BeanUtil.toBean(courseInfoAddParam, CourseInfo.class);
+        //设置审核状态变成待审核
+        courseInfo.setVerifyStatus("1");
+        courseInfoService.addOne(courseInfo);
+        //2.要查回关联的那条课程审核记录，然后进行绑定
+        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseInfoAddParam.getCourseAuditId());
+        courseAuditRecord.setCourseId(courseInfo.getCourseId());
+        //设置审核状态变成待审核
+        courseAuditRecord.setVerifyStatus("1");
+        courseAuditRecordService.editOne(courseAuditRecord);
         return CommonResult.ok();
     }
 
     /**
-     * 编辑课程信息表
+     * 课程信息-编辑
      *
      * @author honorfire
      * @date  2025/06/20 15:00
      */
     @ApiOperationSupport(order = 3)
-    @ApiOperation("编辑课程信息表")
-    @CommonLog("编辑课程信息表")
+    @ApiOperation("课程信息-编辑")
+    @CommonLog("课程信息-编辑")
     @SaCheckPermission("/disk/courseinfo/edit")
     @PostMapping("/disk/courseinfo/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
-        courseInfoService.edit(courseInfoEditParam);
+        //1.先更新课程基础信息
+        CourseInfo courseInfo = BeanUtil.toBean(courseInfoEditParam, CourseInfo.class);
+        //设置审核状态重新变成待审核
+        courseInfo.setVerifyStatus("1");
+        courseInfoService.editOne(courseInfo);
+        //2.要查回关联的那条课程审核记录，同样修改状态变成待审核
+        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseInfoEditParam.getCourseAuditId());
+        courseAuditRecord.setVerifyStatus("1");
+        courseAuditRecordService.editOne(courseAuditRecord);
         return CommonResult.ok();
     }
 
@@ -125,8 +159,11 @@ public class CourseInfoController {
     @ApiOperation("获取课程信息表详情")
     @SaCheckPermission("/disk/courseinfo/detail")
     @GetMapping("/disk/courseinfo/detail")
-    public CommonResult<CourseInfo> detail(@Valid CourseInfoIdParam courseInfoIdParam) {
-        return CommonResult.data(courseInfoService.detail(courseInfoIdParam));
+    public CommonResult<Map<String,Object>> detail(@Valid CourseInfoIdParam courseInfoIdParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("courseId", req.getParameter("courseId"));
+        Map<String,Object> result=courseInfoService.queryInfo(param);
+        return CommonResult.data(result);
     }
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CourseAuditRecord.java

@@ -35,12 +35,20 @@ public class CourseAuditRecord {
     @ApiModelProperty(value = "主键ID", position = 1)
     private String id;
 
+    /** 附件ID */
+    @ApiModelProperty(value = "附件ID", position = 2)
+    private String fileId;
+
+    /** 附件名称 */
+    @ApiModelProperty(value = "附件名称", position = 2)
+    private String fileName;
+
     /** 关联的课程ID */
     @ApiModelProperty(value = "关联的课程ID", position = 2)
     private String courseId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 3)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 3)
     private String verifyStatus;
 
     /** 删除标记 */

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CourseInfo.java

@@ -55,13 +55,13 @@ public class CourseInfo {
     @ApiModelProperty(value = "授课教师/人员ID", position = 6)
     private String teacherId;
 
-    /** 所属院ID */
-    @ApiModelProperty(value = "所属院ID", position = 7)
+    /** 所属院系ID */
+    @ApiModelProperty(value = "所属院系ID", position = 7)
     private String collegeId;
 
-    /** 课程格式ID（视频/文档等） */
-    @ApiModelProperty(value = "课程格式ID（视频/文档等）", position = 8)
-    private String formatId;
+    /** 附件id */
+    @ApiModelProperty(value = "附件id", position = 8)
+    private String fileId;
 
     /** 课程发布时间 */
     @ApiModelProperty(value = "课程发布时间", position = 9)
@@ -109,11 +109,11 @@ public class CourseInfo {
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
 
-    /** 所属系ID */
-    @ApiModelProperty(value = "所属系ID", position = 19)
+    /** 所属专业ID */
+    @ApiModelProperty(value = "所属专业ID", position = 19)
     private String majorId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 20)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 20)
     private String verifyStatus;
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseInfo/CourseInfoAddParam.java

@@ -51,13 +51,14 @@ public class CourseInfoAddParam {
     @ApiModelProperty(value = "授课教师/人员ID", position = 6)
     private String teacherId;
 
-    /** 所属院ID */
-    @ApiModelProperty(value = "所属院ID", position = 7)
+    /** 所属院系ID */
+    @ApiModelProperty(value = "所属院系ID", position = 7)
+    @NotBlank(message = "courseId不能为空")
     private String collegeId;
 
-    /** 课程格式ID（视频/文档等） */
-    @ApiModelProperty(value = "课程格式ID（视频/文档等）", position = 8)
-    private String formatId;
+    /** 附件id */
+    @ApiModelProperty(value = "附件id", position = 8)
+    private String fileId;
 
     /** 课程发布时间 */
     @ApiModelProperty(value = "课程发布时间", position = 9)
@@ -79,12 +80,17 @@ public class CourseInfoAddParam {
     @ApiModelProperty(value = "课程播放/浏览次数", position = 13)
     private Long viewCount;
 
-    /** 所属系ID */
-    @ApiModelProperty(value = "所属系ID", position = 19)
+    /** 所属专业ID */
+    @ApiModelProperty(value = "所属专业ID", position = 19)
     private String majorId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 20)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 20)
     private String verifyStatus;
 
+    /** 课程审核记录id */
+    @ApiModelProperty(value = "课程审核记录id", position = 2)
+    @NotBlank(message = "课程审核记录id不能为空")
+    private String courseAuditId;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseInfo/CourseInfoEditParam.java

@@ -56,13 +56,13 @@ public class CourseInfoEditParam {
     @ApiModelProperty(value = "授课教师/人员ID", position = 6)
     private String teacherId;
 
-    /** 所属院ID */
-    @ApiModelProperty(value = "所属院ID", position = 7)
+    /** 所属院系ID */
+    @ApiModelProperty(value = "所属院系ID", position = 7)
     private String collegeId;
 
     /** 课程格式ID（视频/文档等） */
     @ApiModelProperty(value = "课程格式ID（视频/文档等）", position = 8)
-    private String formatId;
+    private String fileId;
 
     /** 课程发布时间 */
     @ApiModelProperty(value = "课程发布时间", position = 9)
@@ -84,12 +84,17 @@ public class CourseInfoEditParam {
     @ApiModelProperty(value = "课程播放/浏览次数", position = 13)
     private Long viewCount;
 
-    /** 所属系ID */
-    @ApiModelProperty(value = "所属系ID", position = 19)
+    /** 所属专业ID */
+    @ApiModelProperty(value = "所属专业ID", position = 19)
     private String majorId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 20)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 20)
     private String verifyStatus;
 
+    /** 课程审核记录id */
+    @ApiModelProperty(value = "课程审核记录id", position = 2)
+    @NotBlank(message = "课程审核记录id不能为空")
+    private String courseAuditId;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseauditrecord/CourseAuditRecordAddParam.java

@@ -31,12 +31,21 @@ import java.util.Date;
 @Setter
 public class CourseAuditRecordAddParam {
 
+    /** 附件ID */
+    @ApiModelProperty(value = "附件ID", position = 2)
+    @NotBlank(message = "附件ID不能为空")
+    private String fileId;
+
+    /** 附件名称 */
+    @ApiModelProperty(value = "附件名称", position = 2)
+    private String fileName;
+
     /** 关联的课程ID */
     @ApiModelProperty(value = "关联的课程ID", position = 2)
     private String courseId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 3)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 3)
     private String verifyStatus;
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseauditrecord/CourseAuditRecordEditParam.java

@@ -36,12 +36,16 @@ public class CourseAuditRecordEditParam {
     @NotBlank(message = "id不能为空")
     private String id;
 
+    /** 附件ID */
+    @ApiModelProperty(value = "附件ID", position = 2)
+    private String fileId;
+
     /** 关联的课程ID */
     @ApiModelProperty(value = "关联的课程ID", position = 2)
     private String courseId;
 
-    /** 审核状态id，0未审核，1已发布，2未通过，3已删除 */
-    @ApiModelProperty(value = "审核状态id，0未审核，1已发布，2未通过，3已删除", position = 3)
+    /** 审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除 */
+    @ApiModelProperty(value = "审核状态id，0未发布，1待审核，2已发布，3未通过，4已删除", position = 3)
     private String verifyStatus;
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/CourseAuditRecordMapper.java

@@ -13,8 +13,12 @@
 package vip.xiaonuo.disk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.CourseAuditRecord;
 
+import java.util.Map;
+
 /**
  * 课程审核记录表Mapper接口
  *
@@ -22,4 +26,14 @@ import vip.xiaonuo.disk.domain.CourseAuditRecord;
  * @date  2025/06/20 14:58
  **/
 public interface CourseAuditRecordMapper extends BaseMapper<CourseAuditRecord> {
+
+    /**
+     * 课程审核-分页列表
+     */
+    Page<Map<String,Object>> queryList(@Param("param") Map param, @Param("page") Page<Object> page);
+
+    /**
+     * 课程审核-详情
+     */
+    Map<String,Object> queryInfo(Map param);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/CourseInfoMapper.java

@@ -13,8 +13,12 @@
 package vip.xiaonuo.disk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.CourseInfo;
 
+import java.util.Map;
+
 /**
  * 课程信息表Mapper接口
  *
@@ -22,4 +26,14 @@ import vip.xiaonuo.disk.domain.CourseInfo;
  * @date  2025/06/20 15:00
  **/
 public interface CourseInfoMapper extends BaseMapper<CourseInfo> {
+
+    /**
+     * 课程信息-分页列表
+     */
+    Page<Map<String,Object>> queryList(@Param("param") Map param, @Param("page") Page<Object> page);
+
+    /**
+     * 课程信息-详情
+     */
+    Map<String,Object> queryInfo(Map param);
 }

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

@@ -2,4 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.disk.mapper.CourseAuditRecordMapper">
 
+    <select id="queryList" resultType="java.util.Map">
+        SELECT
+            t1.ID as id,
+            t1.FILE_ID AS fileId,
+            t1.FILE_NAME AS fileName,
+            t2.SUFFIX AS suffix,
+            t1.VERIFY_STATUS as verifyStatus,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
+        <if test=" param.verifyStatus == 2 or param.verifyStatus == 3 or param.verifyStatus == 4">
+            t3.COLLEGE_ID AS collegeId,
+            t4.college_name AS collegeIdName,
+            t3.MAJOR_ID AS majorId,
+            t5.major_name AS majorIdName,
+            t3.COURSE_TYPE AS courseType,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t3.COURSE_TYPE) ),'') AS courseTypeName,
+            t1.COURSE_ID as courseId,
+        </if>
+            t2.CREATE_TIME as uploadTime
+        FROM COURSE_AUDIT_RECORD t1
+        LEFT JOIN DEV_FILE t2 ON t2.id=t1.FILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
+        <if test=" param.verifyStatus == 2 or param.verifyStatus == 3 or param.verifyStatus == 4">
+            LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
+            LEFT JOIN college t4 ON t3.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+            LEFT JOIN major t5 ON t3.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
+        </if>
+        WHERE t1.DELETE_FLAG ='NOT_DELETE'
+        <if test="param.verifyStatus!=null and param.verifyStatus != ''">
+            and t1.VERIFY_STATUS=#{param.verifyStatus}
+        </if>
+        <if test="param.verifyStatusList !=null and param.verifyStatusList.size()>0">
+            and t1.VERIFY_STATUS in
+            <foreach collection=" param.verifyStatusList" close=")" index="index" item="item" open="(" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.fileName!=null and param.fileName != ''">
+            and t2.NAME like CONCAT('%', #{param.fileName}, '%')
+        </if>
+        order by t1.ID desc
+    </select>
+    <select id="queryInfo" resultType="java.util.Map"></select>
 </mapper>

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

@@ -2,4 +2,75 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.disk.mapper.CourseInfoMapper">
 
+    <select id="queryList" resultType="java.util.Map">
+        select
+            t1.COURSE_ID as courseId,
+            t1.COURSE_NAME as courseName,
+            t1.COVER_IMAGE_ID as coverImageId,
+            CAST(t4.DOWNLOAD_PATH AS VARCHAR) AS coverImagePath,
+            t1.TEACHER_ID as teacherId,
+            t7.NAME AS teacherIdName,
+            t1.COLLEGE_ID as collegeId,
+            t2.college_name AS collegeIdName,
+            t1.PUBLISH_TIME as publishTime,
+            t1.TIME_LIMIT_TYPE as timeLimitType,
+            t1.START_TIME as startTime,
+            t1.END_TIME as endTime,
+            t1.VIEW_COUNT as viewCount
+        FROM COURSE_INFO t1
+        LEFT JOIN college t2 ON t1.COLLEGE_ID=t2.id AND t2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE t4 ON t1.COVER_IMAGE_ID =t4.ID AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER t7 ON t7.ID=t1.TEACHER_ID AND t7.DELETE_FLAG ='NOT_DELETE'
+        WHERE t1.DELETE_FLAG ='NOT_DELETE'
+        <if test="param.collegeId !=null and param.collegeId != ''">
+            and t1.COLLEGE_ID=#{param.courseId}
+        </if>
+        <if test="param.majorId !=null and param.majorId != ''">
+            and t1.MAJOR_ID=#{param.majorId}
+        </if>
+        <if test="param.courseType !=null and param.courseType != ''">
+            and t1.COURSE_TYPE=#{param.courseType}
+        </if>
+        <if test="param.courseName !=null and param.courseName != ''">
+            and t1.COURSE_NAME=#{param.courseName}
+        </if>
+        order by t1.PUBLISH_TIME desc
+    </select>
+
+    <select id="queryInfo" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+            t1.COURSE_ID as courseId,
+            t1.COURSE_NAME as courseName,
+            t1.COURSE_TYPE as courseType,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS courseTypeName,
+            t1.COURSE_DESC as courseDesc,
+            t1.COVER_IMAGE_ID as coverImageId,
+            CAST(t4.DOWNLOAD_PATH AS VARCHAR) AS coverImagePath,
+            t1.TEACHER_ID as teacherId,
+            t7.NAME AS teacherIdName,
+            t1.COLLEGE_ID AS collegeId,
+            t2.college_name AS collegeIdName,
+            t1.MAJOR_ID AS majorId,
+            t3.major_name AS majorIdName,
+            t1.FILE_ID as fileId,
+            CAST(t5.DOWNLOAD_PATH AS VARCHAR) AS filePath,
+            t1.VERIFY_STATUS as verifyStatus,
+            t1.PUBLISH_TIME as publishTime,
+            t1.TIME_LIMIT_TYPE as timeLimitType,
+            t1.START_TIME as startTime,
+            t1.END_TIME as endTime,
+            t6.id as courseAuditId,
+            t1.VIEW_COUNT as viewCount
+        FROM COURSE_INFO t1
+        LEFT JOIN college t2 ON t1.COLLEGE_ID=t2.id AND t2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN major t3 ON t1.MAJOR_ID=t3.id AND t3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE t4 ON t1.COVER_IMAGE_ID =t4.ID AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE t5 ON t1.FILE_ID =t5.ID AND t5.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN COURSE_AUDIT_RECORD t6 ON t6.COURSE_ID =t1.COURSE_ID AND t6.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER t7 ON t7.ID=t1.TEACHER_ID AND t7.DELETE_FLAG ='NOT_DELETE'
+        WHERE t1.DELETE_FLAG ='NOT_DELETE'
+        <if test="courseId !=null and courseId != ''">
+            and t1.COURSE_ID=#{courseId}
+        </if>
+    </select>
 </mapper>

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

@@ -10,10 +10,10 @@
             t1.USER_ID AS userId,
             t2.NAME AS userIdName,
             t1.IS_CREATER AS isCreater,
-            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='GROUP_IS_CREATER') )dd1 WHERE dd1.DICT_VALUE= t1.IS_CREATER ),'') AS isCreaterName
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='GROUP_IS_CREATER') )dd1 WHERE dd1.DICT_VALUE= TRIM(t1.IS_CREATER) ),'') AS isCreaterName
         FROM SHARE_GROUP_USER t1
         LEFT JOIN SYS_USER t2 ON t1.USER_ID=t2.ID AND t2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN SYS_USER t3 ON t1.USER_ID=t3.ID AND t3.DELETE_FLAG ='NOT_DELETE' AND t3.IS_RESOURCEACCOUNT ='1'
+        LEFT JOIN SYS_USER t3 ON t1.GROUP_ID=t3.ID AND t3.DELETE_FLAG ='NOT_DELETE' AND t3.IS_RESOURCEACCOUNT ='1'
         where t1.DELETE_FLAG ='NOT_DELETE'
         <if test="groupId!=null and groupId != ''">
             and t1.GROUP_ID=#{groupId}

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/CourseAuditRecordService.java

@@ -21,6 +21,7 @@ import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordIdParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordPageParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程审核记录表Service接口
@@ -38,6 +39,14 @@ public interface CourseAuditRecordService extends IService<CourseAuditRecord> {
      */
     Page<CourseAuditRecord> page(CourseAuditRecordPageParam courseAuditRecordPageParam);
 
+    /**
+     * 课程审核记录-添加
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    CourseAuditRecord addOne(CourseAuditRecord courseAuditRecord);
+
     /**
      * 添加课程审核记录表
      *
@@ -54,6 +63,14 @@ public interface CourseAuditRecordService extends IService<CourseAuditRecord> {
      */
     void edit(CourseAuditRecordEditParam courseAuditRecordEditParam);
 
+    /**
+     * 课程审核记录-编辑
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    CourseAuditRecord editOne(CourseAuditRecord courseAuditRecord);
+
     /**
      * 删除课程审核记录表
      *
@@ -78,4 +95,14 @@ public interface CourseAuditRecordService extends IService<CourseAuditRecord> {
      **/
     CourseAuditRecord queryEntity(String id);
 
+    /**
+     *  课程审核-分页列表
+     */
+    Page<Map<String,Object>> queryList(Map param);
+
+    /**
+     *  课程审核-详情
+     */
+    Map<String,Object> queryInfo(Map param);
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/CourseInfoService.java

@@ -21,6 +21,7 @@ import vip.xiaonuo.disk.dto.courseInfo.CourseInfoEditParam;
 import vip.xiaonuo.disk.dto.courseInfo.CourseInfoIdParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程信息表Service接口
@@ -46,6 +47,14 @@ public interface CourseInfoService extends IService<CourseInfo> {
      */
     void add(CourseInfoAddParam courseInfoAddParam);
 
+    /**
+     * 课程信息-添加
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    CourseInfo addOne(CourseInfo courseInfo);
+
     /**
      * 编辑课程信息表
      *
@@ -54,6 +63,14 @@ public interface CourseInfoService extends IService<CourseInfo> {
      */
     void edit(CourseInfoEditParam courseInfoEditParam);
 
+    /**
+     * 课程信息表-编辑
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    CourseInfo editOne(CourseInfo courseInfo);
+
     /**
      * 删除课程信息表
      *
@@ -78,4 +95,14 @@ public interface CourseInfoService extends IService<CourseInfo> {
      **/
     CourseInfo queryEntity(String id);
 
+
+    /**
+     *  课程信息-分页列表
+     */
+    Page<Map<String,Object>> queryList(Map param);
+
+    /**
+     *  课程信息-详情
+     */
+    Map<String,Object> queryInfo(Map param);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CourseAuditRecordServiceImpl.java

@@ -25,6 +25,7 @@ import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.disk.domain.CourseAuditRecord;
+import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordAddParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordEditParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordIdParam;
@@ -32,7 +33,9 @@ import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordPageParam;
 import vip.xiaonuo.disk.mapper.CourseAuditRecordMapper;
 import vip.xiaonuo.disk.service.CourseAuditRecordService;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程审核记录表Service接口实现类
@@ -43,6 +46,8 @@ import java.util.List;
 @Service
 public class CourseAuditRecordServiceImpl extends ServiceImpl<CourseAuditRecordMapper, CourseAuditRecord> implements CourseAuditRecordService {
 
+    @Resource
+    private CourseAuditRecordMapper courseAuditRecordMapper;
 
     @Override
     public Page<CourseAuditRecord> page(CourseAuditRecordPageParam courseAuditRecordPageParam) {
@@ -64,6 +69,13 @@ public class CourseAuditRecordServiceImpl extends ServiceImpl<CourseAuditRecordM
         this.save(courseAuditRecord);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public CourseAuditRecord addOne(CourseAuditRecord courseAuditRecord) {
+        this.save(courseAuditRecord);
+        return courseAuditRecord;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(CourseAuditRecordEditParam courseAuditRecordEditParam) {
@@ -72,6 +84,13 @@ public class CourseAuditRecordServiceImpl extends ServiceImpl<CourseAuditRecordM
         this.updateById(courseAuditRecord);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public CourseAuditRecord editOne(CourseAuditRecord courseAuditRecord) {
+        this.updateById(courseAuditRecord);
+        return courseAuditRecord;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<CourseAuditRecordIdParam> courseAuditRecordIdParamList) {
@@ -93,4 +112,17 @@ public class CourseAuditRecordServiceImpl extends ServiceImpl<CourseAuditRecordM
         return courseAuditRecord;
     }
 
+    @Override
+    public Page<Map<String,Object>> queryList(Map param)
+    {
+        return courseAuditRecordMapper.queryList(param,CommonPageRequest.defaultPage());
+    }
+
+
+    @Override
+    public Map<String,Object> queryInfo(Map param)
+    {
+        return courseAuditRecordMapper.queryInfo(param);
+    }
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CourseInfoServiceImpl.java

@@ -32,7 +32,9 @@ import vip.xiaonuo.disk.dto.courseInfo.CourseInfoPageParam;
 import vip.xiaonuo.disk.mapper.CourseInfoMapper;
 import vip.xiaonuo.disk.service.CourseInfoService;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程信息表Service接口实现类
@@ -43,6 +45,8 @@ import java.util.List;
 @Service
 public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseInfo> implements CourseInfoService {
 
+    @Resource
+    private CourseInfoMapper courseInfoMapper;
 
     @Override
     public Page<CourseInfo> page(CourseInfoPageParam courseInfoPageParam) {
@@ -64,6 +68,13 @@ public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseI
         this.save(courseInfo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public CourseInfo addOne(CourseInfo courseInfo) {
+        this.save(courseInfo);
+        return courseInfo;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(CourseInfoEditParam courseInfoEditParam) {
@@ -72,6 +83,13 @@ public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseI
         this.updateById(courseInfo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public CourseInfo editOne(CourseInfo courseInfo) {
+        this.updateById(courseInfo);
+        return courseInfo;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<CourseInfoIdParam> courseInfoIdParamList) {
@@ -93,4 +111,19 @@ public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseI
         return courseInfo;
     }
 
+    @Override
+    public Page<Map<String,Object>> queryList(Map param)
+    {
+        return courseInfoMapper.queryList(param,CommonPageRequest.defaultPage());
+    }
+
+
+    @Override
+    public Map<String,Object> queryInfo(Map param)
+    {
+        return courseInfoMapper.queryInfo(param);
+    }
+
+
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -18,7 +18,7 @@
             and t1.NAME like concat("%",#{param.groupIdName},"%")
         </if>
         <if test="param.groupId !=null and param.groupId != ''">
-            and t1.NAME = #{param.groupId}
+            and t1.ID = #{param.groupId}
         </if>
     </select>
 </mapper>