1.主要是应2026.6.27内部需求，修改资源中心相关接口，与资源管理分化，加入动态判断具体逻辑

2.资源管理与前端对接中修改部分逻辑bug，如发布修改状态，应前端需要修改一些细节
3.修改专业相关bug

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

@@ -25,6 +25,7 @@ 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;
@@ -47,12 +48,12 @@ import javax.validation.constraints.NotEmpty;
 import java.util.*;
 
 /**
- * 课程审核记录表控制器
+ * 资源管理控制器
  *
  * @author honorfire
  * @date  2025/06/20 14:58
  */
-@Api(tags = "课程审核记录表控制器")
+@Api(tags = "资源管理控制器")
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
 @Validated
@@ -72,13 +73,13 @@ public class CourseAuditRecordController {
 
 
     /**
-     * 获取课程审核记录表分页
+     * 资源管理-分页列表
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 1)
-    @ApiOperation("获取课程审核记录表分页")
+    @ApiOperation("资源管理-分页列表")
     @SaCheckPermission("/disk/courseauditrecord/page")
     @GetMapping("/disk/courseauditrecord/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
@@ -99,15 +100,64 @@ public class CourseAuditRecordController {
         return CommonResult.data(list);
     }
 
+
+    /**
+     * 资源中心-分页列表
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("资源中心-分页列表")
+    @SaCheckPermission("/disk/resourcecentre/page")
+    @GetMapping("/disk/resourcecentre/page")
+    public CommonResult<Page<Map<String,Object>>> resourcecentrePage(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        //资源中心排序标识，0最新，1热门，默认为0
+        String sortflag="0";
+        if(StringUtils.isNotEmpty(req.getParameter("queryFlag")))sortflag=req.getParameter("sortflag");
+        param.put("sortflag", sortflag);
+        //资源中心功能标识，0默认，1资源推荐，2相关资源
+        String funcType="0";
+        if(StringUtils.isNotEmpty(req.getParameter("funcType")))funcType=req.getParameter("funcType");
+        param.put("funcType", funcType);
+        if("2".equals(funcType))
+        {
+            String userId=StpLoginUserUtil.getLoginUser().getId();
+        }
+
+        //资源中心必须全部是审核通过已发布的
+        String verifyStatus="2";
+        param.put("verifyStatus", verifyStatus);
+        //检索信息
+        if(StringUtils.isNotEmpty(req.getParameter("queryInfo")))
+        {
+            //信息检索会从多个方面触发，用or连接，分别检索资源名称，资源名称，资源拼音，关键词，关键词拼音，老师名称
+            String queryInfo=req.getParameter("queryInfo");
+            param.put("queryInfo", queryInfo);
+            String queryInfoPinyin=StringUtils.deleteWhitespace(pinyinUtils.toPinyin(queryInfo));
+            param.put("queryInfoPinyin", queryInfoPinyin);
+        }
+
+        param.put("collegeId", req.getParameter("collegeId"));
+        param.put("collegeTwoId", req.getParameter("collegeTwoId"));
+        param.put("collegeThreeId", req.getParameter("collegeThreeId"));
+        param.put("majorId", req.getParameter("majorId"));
+        param.put("courseType", req.getParameter("courseType"));
+        param.put("suffix", req.getParameter("suffix"));
+        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) {
@@ -131,14 +181,14 @@ public class CourseAuditRecordController {
     }
 
     /**
-     * 课程审核记录-编辑
+     * 资源管理-编辑
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 3)
-    @ApiOperation("课程审核记录-编辑")
-    @CommonLog("编辑课程审核记录表")
+    @ApiOperation("资源管理-编辑")
+    @CommonLog("资源管理-编辑")
     @SaCheckPermission("/disk/courseauditrecord/edit")
     @PostMapping("/disk/courseauditrecord/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
@@ -149,14 +199,14 @@ public class CourseAuditRecordController {
     }
 
     /**
-     * 课程审核记录-修改状态
+     * 资源管理-修改状态
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 3)
-    @ApiOperation("课程审核记录-修改状态")
-    @CommonLog("课程审核记录-修改状态")
+    @ApiOperation("资源管理-修改状态")
+    @CommonLog("资源管理-修改状态")
     @SaCheckPermission("/disk/courseauditrecord/updateStatus")
     @PostMapping("/disk/courseauditrecord/updateStatus")
     public CommonResult<String> updateStatus(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
@@ -172,16 +222,26 @@ public class CourseAuditRecordController {
         }
 
         //修改审核状态需要同步改变课程状态（2025.6.26废弃）
-        //1.查回课程审核记录设置审核状态
-        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseAuditRecordEditParam.getId());
-        courseAuditRecord.setVerifyStatus(courseAuditRecordEditParam.getVerifyStatus());
-        courseAuditRecordService.editOne(courseAuditRecord);
-        //2.查回对应课程信息
-        CourseInfo courseInfo=courseInfoService.queryEntity(courseAuditRecord.getCourseId());
+        //批量处理资源管理击状态
+        String idsStr=courseAuditRecordEditParam.getIds();
+        String[] idList = idsStr.split(",");
+        List<CourseAuditRecord> courseAuditRecordList = new ArrayList<>();
+        for (String id : idList) {
+            //1.查回课程审核记录（资源管理）设置审核状态以及相关信息
+            CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(id);
+            if("1".equals(courseAuditRecordEditParam.getVerifyStatus()))courseAuditRecord.setResourceDesc(courseAuditRecordEditParam.getResourceDesc());
+            if("1".equals(courseAuditRecordEditParam.getVerifyStatus()))courseAuditRecord.setCoverImage(courseAuditRecordEditParam.getCoverImage());
+            courseAuditRecord.setVerifyStatus(courseAuditRecordEditParam.getVerifyStatus());
+            courseAuditRecordList.add(courseAuditRecord);
+        }
+        courseAuditRecordService.editBatch(courseAuditRecordList);
+
+        //2.查回对应课程信息（2025.6.27废弃，课程和资源解耦，不在强绑定）
+//        CourseInfo courseInfo=courseInfoService.queryEntity(courseAuditRecord.getCourseId());
         //设置审核状态（2025.6.26废弃）
 //        courseInfo.setVerifyStatus(courseAuditRecord.getVerifyStatus());
 //        if("2".equals(courseAuditRecordEditParam.getVerifyStatus()))courseInfo.setPublishTime(new Date());
-        //查看是否课程有关联资源（2025.6.27废弃，课程和资源解耦，不在强绑定）
+        //查看是否课程有关联资源
 //        Map queryRelateParam = new HashMap();
 //        queryRelateParam.put("courseId", courseInfo.getCourseId());
 //        queryRelateParam.put("verifyStatus", "2");
@@ -200,14 +260,31 @@ public class CourseAuditRecordController {
     }
 
     /**
-     * 删除课程审核记录表
+     * 资源中心-添加浏览次数
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("资源中心-添加浏览次数")
+    @CommonLog("资源中心-添加浏览次数")
+    @SaCheckPermission("/disk/courseauditrecord/addViewCount")
+    @PostMapping("/disk/courseauditrecord/addViewCount")
+    public CommonResult<String> addViewCount(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
+        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseAuditRecordEditParam.getId());
+        courseAuditRecord.setViewCount(String.valueOf(Integer.valueOf(courseAuditRecord.getViewCount())+1));
+        return CommonResult.ok();
+    }
+
+    /**
+     * 资源管理-删除
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 4)
-    @ApiOperation("删除课程审核记录表")
-    @CommonLog("删除课程审核记录表")
+    @ApiOperation("资源管理-删除")
+    @CommonLog("资源管理-删除")
     @SaCheckPermission("/disk/courseauditrecord/delete")
     @PostMapping("/disk/courseauditrecord/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
@@ -217,13 +294,13 @@ public class CourseAuditRecordController {
     }
 
     /**
-     * 获取课程审核记录表详情
+     * 资源管理-详情
      *
      * @author honorfire
      * @date  2025/06/20 14:58
      */
     @ApiOperationSupport(order = 5)
-    @ApiOperation("获取课程审核记录表详情")
+    @ApiOperation("资源管理-详情")
     @SaCheckPermission("/disk/courseauditrecord/detail")
     @GetMapping("/disk/courseauditrecord/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
@@ -233,4 +310,20 @@ public class CourseAuditRecordController {
         return CommonResult.data(result);
     }
 
+    /**
+     * 资源中心-详情
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("资源中心-详情")
+    @SaCheckPermission("/disk/resourcecentre/detail")
+    @GetMapping("/disk/resourcecentre/detail")
+    public CommonResult<Map<String,Object>> resourcecentreDetail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("id", req.getParameter("id"));
+        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/MajorController.java

@@ -125,7 +125,7 @@ public class MajorController {
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取major详情")
     @GetMapping("/disk/major/select")
-    public CommonResult<List<MajorVo>> select(@RequestParam(value = "collegeId",required = true) Integer collegeId) {
+    public CommonResult<List<MajorVo>> select(@RequestParam(value = "collegeId",required = true) String collegeId) {
         return CommonResult.data(majorService.select(collegeId));
     }
 

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

@@ -92,4 +92,16 @@ public class CourseAuditRecord extends CommonEntity {
     /** 是否热门 */
     @ApiModelProperty(value = "是否热门，0否1是", position = 7)
     private String isHot;
+
+    /** 资源信息 */
+    @ApiModelProperty(value = "资源信息", position = 13)
+    private String resourceDesc;
+
+    /** 资源封面附件id */
+    @ApiModelProperty(value = "资源封面附件id", position = 13)
+    private String coverImage;
+
+    /** 浏览次数 */
+    @ApiModelProperty(value = "浏览次数", position = 13)
+    private String viewCount;
 }

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

@@ -18,6 +18,7 @@ import com.qiwenshare.common.util.DateUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.util.PinyinUtils;
 import vip.xiaonuo.disk.io.QiwenFile;
 
 import java.math.BigDecimal;
@@ -74,6 +75,10 @@ public class ResourceUserFile {
     @ApiModelProperty(value = "FILE_NAME", position = 9)
     private String fileName;
 
+    /** FILE_NAME_PINYIN */
+    @ApiModelProperty(value = "FILE_NAME_PINYIN", position = 9)
+    private String fileNamePinyin;
+
     /** FILE_PATH */
     @ApiModelProperty(value = "FILE_PATH", position = 10)
     private String filePath;
@@ -110,6 +115,11 @@ public class ResourceUserFile {
         this.fileId = fileId;
         this.filePath = qiwenFile.getParent();
         this.fileName = qiwenFile.getNameNotExtend();
+        try {
+            this.fileNamePinyin = PinyinUtils.toPinyin(qiwenFile.getNameNotExtend());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         this.extendName = qiwenFile.getExtendName();
         this.isDir = qiwenFile.isDirectory() ? 1 : 0;
         String currentTime = DateUtil.getCurrentTime();

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

@@ -36,6 +36,11 @@ public class CourseAuditRecordEditParam {
     @NotBlank(message = "id不能为空")
     private String id;
 
+    /** 主键ID组 */
+    @ApiModelProperty(value = "主键ID组", required = true, position = 1)
+    @NotBlank(message = "id组不能为空")
+    private String ids;
+
     /** 用户附件ID（RESOURCE_USERFILE的id） */
     @ApiModelProperty(value = "用户附件ID（RESOURCE_USERFILE的id）", position = 2)
     private String userFileId;

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

@@ -48,4 +48,8 @@ public class CourseAuditRecordPageParam {
     @ApiModelProperty(value = "关键词")
     private String searchKey;
 
+    /** 功能标识 */
+    @ApiModelProperty(value = "功能标识")
+    private String funcType;
+
 }

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

@@ -28,10 +28,15 @@ import java.util.Map;
 public interface CourseAuditRecordMapper extends BaseMapper<CourseAuditRecord> {
 
     /**
-     * 课程审核-分页列表
+     * 资源管理-分页列表
      */
     Page<Map<String,Object>> queryList(@Param("param") Map param, @Param("page") Page<Object> page);
 
+    /**
+     * 资源中心-分页列表
+     */
+    Page<Map<String,Object>> queryResourceCentreList(@Param("param") Map param, @Param("page") Page<Object> page);
+
     /**
      * 课程审核-详情
      */

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

@@ -32,7 +32,7 @@ import java.util.List;
 public interface MajorMapper extends BaseMapper<Major> {
     Page<MajorVo> selectMajorList(@Param("page") Page<Object> objectPage, @Param("majorPageParam") MajorPageParam majorPageParam);
 
-    MajorVo detail(@NotNull(message = "id不能为空") Integer id);
+    MajorVo detail(@NotNull(message = "id不能为空") String id);
 
-    List<MajorVo> select(Integer collegeId);
+    List<MajorVo> select(String collegeId);
 }

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

@@ -13,7 +13,11 @@
 package vip.xiaonuo.disk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.ResourceUserFile;
+import vip.xiaonuo.disk.domain.UserFile;
+
+import java.util.List;
 
 /**
  * RESOURCE_USERFILEMapper接口
@@ -22,4 +26,6 @@ import vip.xiaonuo.disk.domain.ResourceUserFile;
  * @date  2025/06/26 09:29
  **/
 public interface ResourceUserFileMapper extends BaseMapper<ResourceUserFile> {
+
+    List<ResourceUserFile> selectUserFileByLikeRightFilePath(@Param("filePath") String filePath, @Param("userId") String userId);
 }

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

@@ -7,8 +7,9 @@
             t1.ID as id,
             t1.USERFILE_ID AS fileId,
             t2.FILE_NAME AS fileName,
-            t2.EXTEND_NAME AS suffix,
+            rf.FILE_URL AS fileUrl,
             t2.CREATE_TIME as uploadTime,
+            t2.EXTEND_NAME AS suffix,
             IFNULL (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,
             IFNULL (t1.COLLEGE_ID,'') AS collegeId,
@@ -17,6 +18,7 @@
             IFNULL (t42.NAME,'') AS collegeTwoIdName,
             IFNULL (t1.COLLEGE_THREE_ID,'') AS collegeThreeId,
             IFNULL (t43.NAME,'') AS collegeThreeIdName,
+            CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID) AS collegeAllId,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.COURSE_TYPE,'') AS courseType,
@@ -25,6 +27,7 @@
             IFNULL (t3.COURSE_NAME,'') AS courseIdName
         FROM COURSE_AUDIT_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='0'
+        LEFT JOIN RESOURCE_FILE rf ON t2.FILE_ID= rf.FILE_ID
         LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
@@ -64,21 +67,91 @@
         </if>
         order by t1.ID desc
     </select>
+
+    <select id="queryResourceCentreList" resultType="java.util.Map">
+        SELECT
+        t1.ID as id,
+        t1.USERFILE_ID AS fileId,
+        t2.FILE_NAME AS fileName,
+        t2.CREATE_TIME as uploadTime,
+        IFNULL (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,
+        IFNULL (t1.COLLEGE_ID,'') AS collegeId,
+        IFNULL (t4.NAME,'') AS collegeIdName,
+        t1.VIEW_COUNT as viewCount,
+        IFNULL (CAST(t6.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath
+        FROM COURSE_AUDIT_RECORD t1
+        LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='0'
+        LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN college t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
+        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.queryInfo!=null and param.queryInfo != ''">
+            AND (t2.FILE_NAME LIKE CONCAT('%',#{param.queryInfo}, '%') OR t2.FILE_NAME_PINYIN LIKE CONCAT('%',#{param.queryInfoPinyin}, '%') OR t1.KEYWORD_VALUE LIKE CONCAT('%',#{param.queryInfo}, '%') OR t1.KEYWORD_PINYIN LIKE CONCAT('%',#{param.queryInfoPinyin}, '%') OR t7.NAME LIKE CONCAT('%',#{param.queryInfo}, '%'))
+        </if>
+        <if test="param.collegeId!=null and param.collegeId != ''">
+            and t1.COLLEGE_ID=#{param.collegeId}
+        </if>
+        <if test="param.collegeTwoId!=null and param.collegeTwoId != ''">
+            and t1.COLLEGE_TWO_ID=#{param.collegeTwoId}
+        </if>
+        <if test="param.collegeThreeId!=null and param.collegeThreeId != ''">
+            and t1.COLLEGE_THREE_ID=#{param.collegeThreeId}
+        </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.suffix!=null and param.suffix != ''">
+            and t1.EXTEND_NAME like CONCAT('%',#{param.suffix}, '%')
+        </if>
+        <if test="param.funcType!=null and param.funcType != ''">
+            <if test=" param.funcType == 1">
+                and t1.IS_RECOMMEND='1'
+            </if>
+
+        </if>
+        <if test="param.sortflag !=null and param.sortflag != ''">
+            <if test=" param.sortflag == 0">
+                order by t1.ID desc
+            </if>
+            <if test=" param.sortflag == 1">
+                ORDER BY t1.IS_HOT=1 DESC, t1.VIEW_COUNT DESC
+            </if>
+        </if>
+    </select>
+
     <select id="queryInfo" resultType="java.util.Map">
         SELECT
             t1.ID as id,
             t1.USERFILE_ID AS fileId,
             t2.FILE_NAME AS fileName,
-            t2.EXTEND_NAME AS suffix,
             t2.CREATE_TIME as uploadTime,
+            t2.EXTEND_NAME AS suffix,
             IFNULL (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,
+            t1.VIEW_COUNT as viewCount,
             IFNULL (t1.COLLEGE_ID,'') AS collegeId,
             IFNULL (t4.NAME,'') AS collegeIdName,
             IFNULL (t1.COLLEGE_TWO_ID,'') AS collegeTwoId,
             IFNULL (t42.NAME,'') AS collegeTwoIdName,
             IFNULL (t1.COLLEGE_THREE_ID,'') AS collegeThreeId,
             IFNULL (t43.NAME,'') AS collegeThreeIdName,
+            CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID) AS collegeAllId,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.COURSE_TYPE,'') AS courseType,

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

@@ -6,20 +6,22 @@
         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.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 isCreaterName,
+            t1.COURSE_DESC as courseDesc,
             t1.TEACHER_ID as teacherId,
             t7.NAME AS teacherIdName,
-            t1.COLLEGE_ID as collegeId,
---             t2.college_name AS collegeIdName,
+            t1.COLLEGE_ID AS collegeId,
+            t2.NAME AS collegeIdName,
+            t1.MAJOR_ID AS majorId,
+            t3.major_name AS majorIdName,
             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
+            t1.END_TIME as endTime
         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 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 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 != ''">
@@ -42,7 +44,7 @@
                 order by t1.VIEW_COUNT desc
             </if>
         </if>
-
+        order by t1.COLLEGE_ID desc
     </select>
 
     <select id="queryInfo" parameterType="java.util.Map" resultType="java.util.Map">
@@ -50,33 +52,22 @@
             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,
+            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 isCreaterName,
             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,
+            t2.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
+            t1.END_TIME as endTime
         FROM COURSE_INFO t1
-        LEFT JOIN college t2 ON t1.COLLEGE_ID=t2.id AND t2.DELETE_FLAG ='NOT_DELETE'
+        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>

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

@@ -43,7 +43,7 @@
             a.major_name majorName,
             a.major_code majorCode,
             a.college_id collegeId,
-            b.college_name collegeName,
+            b.name collegeName,
             a.create_time createTime,
             a.create_user createUser
         FROM

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

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.disk.mapper.ResourceUserFileMapper">
 
+    <select id="selectUserFileByLikeRightFilePath" resultType="vip.xiaonuo.disk.domain.ResourceUserFile">
+        select * from RESOURCE_USERFILE
+        where (FILE_PATH = #{filePath} or FILE_PATH like concat(#{filePath},'/%')) and USER_ID = #{userId} and DELETE_FLAG = 0
+    </select>
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/MajorIdParam.java

@@ -31,5 +31,5 @@ public class MajorIdParam {
     /** ID */
     @ApiModelProperty(value = "ID", required = true)
     @NotNull(message = "id不能为空")
-    private Integer id;
+    private String id;
 }

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

@@ -120,10 +120,15 @@ public interface CourseAuditRecordService extends IService<CourseAuditRecord> {
     CourseAuditRecord queryEntity(String id);
 
     /**
-     *  课程审核-分页列表
+     *  资源管理-分页列表
      */
     Page<Map<String,Object>> queryList(Map param);
 
+    /**
+     *  资源中心-分页列表
+     */
+    Page<Map<String,Object>> queryResourceCentreList(Map param);
+
     /**
      *  课程审核-详情
      */

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

@@ -80,5 +80,5 @@ public interface MajorService extends IService<Major> {
      **/
     Major queryEntity(Integer id);
 
-    List<MajorVo> select(@Valid Integer collegeId);
+    List<MajorVo> select(@Valid String collegeId);
 }

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

@@ -158,6 +158,12 @@ public class CourseAuditRecordServiceImpl extends ServiceImpl<CourseAuditRecordM
         return courseAuditRecordMapper.queryList(param,CommonPageRequest.defaultPage());
     }
 
+    @Override
+    public Page<Map<String,Object>> queryResourceCentreList(Map param)
+    {
+        return courseAuditRecordMapper.queryResourceCentreList(param,CommonPageRequest.defaultPage());
+    }
+
 
     @Override
     public Map<String,Object> queryInfo(Map param)

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

@@ -90,7 +90,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     }
 
     @Override
-    public List<MajorVo> select(Integer collegeId) {
+    public List<MajorVo> select(String collegeId) {
         return majorMapper.select(collegeId);
     }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/file/UploadFileVo.java

@@ -17,6 +17,9 @@ public class UploadFileVo {
     private boolean needMerge;
     @Schema(description = "已经上传的分片", example = "[1,2,3]")
     private List<Integer> uploaded;
+    @Schema(description = "文件用户关联id", example = "true")
+    private String userFileId;
+
 
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/major/MajorVo.java

@@ -15,7 +15,7 @@ public class MajorVo extends CommonEntity {
     /** ID */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "ID", position = 1)
-    private Integer id;
+    private String id;
 
     /** 院系名称 */
     @ApiModelProperty(value = "院系名称", position = 2)