1.资源管理加入二级资源类型，加入资源中心-获取分享链接接口

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

@@ -116,6 +116,7 @@ public class CourseAuditRecordController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("resourceType", req.getParameter("resourceType"));
+        param.put("resourceType", req.getParameter("resourceType"));
         param.put("suffix", req.getParameter("suffix"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
         return CommonResult.data(list);
@@ -136,7 +137,7 @@ public class CourseAuditRecordController {
         Map param =new HashMap();
         //资源中心排序标识，0最新，1热门，默认为0
         String sortflag="0";
-        if(StringUtils.isNotEmpty(req.getParameter("queryFlag")))sortflag=req.getParameter("sortflag");
+        if(StringUtils.isNotEmpty(req.getParameter("sortflag")))sortflag=req.getParameter("sortflag");
         param.put("sortflag", sortflag);
         //资源中心功能标识，0默认，1资源推荐，2相关资源
         String funcType="0";
@@ -298,6 +299,26 @@ public class CourseAuditRecordController {
         return CommonResult.ok();
     }
 
+    /**
+     * 资源中心-获取分享链接
+     *
+     * @author honorfire
+     * @date  2025/06/20 14:58
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("资源中心-获取分享链接")
+    @CommonLog("资源中心-获取分享链接")
+    @GetMapping("/disk/courseauditrecord/getShareLink")
+    public CommonResult<Map<String,Object>> getShareLink(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
+        Map result=new HashMap();
+        String id=req.getParameter("id");
+        CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(id);
+        String userfileId=courseAuditRecord.getUserfileId();
+        String shareLink="/resourceFile/downloadfile?userFileId="+userfileId+"&admin=true";
+        result.put("shareLink", shareLink);
+        return CommonResult.data(result);
+    }
+
     /**
      * 资源管理-删除
      *

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

@@ -86,6 +86,10 @@ public class CourseAuditRecord extends CommonEntity {
     @ApiModelProperty(value = "资源类型", position = 7)
     private String resourceType;
 
+    /** 二级资源类型 */
+    @ApiModelProperty(value = "二级资源类型", position = 7)
+    private String resourceTwoType;
+
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)
     private String isRecommend;

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

@@ -86,6 +86,11 @@ public class CourseAuditRecordAddParam {
     @NotBlank(message = "资源类型不能为空")
     private String resourceType;
 
+    /** 二级资源类型 */
+    @ApiModelProperty(value = "二级资源类型", position = 7)
+    @NotBlank(message = "二级资源类型不能为空")
+    private String resourceTwoType;
+
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)
     private String isRecommend;

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

@@ -81,10 +81,15 @@ public class CourseAuditRecordEditParam {
     @ApiModelProperty(value = "三级院系ID", position = 7)
     private String collegeThreeId;
 
+
     /** 资源类型 */
     @ApiModelProperty(value = "资源类型", position = 7)
     private String resourceType;
 
+    /** 二级资源类型 */
+    @ApiModelProperty(value = "二级资源类型", position = 7)
+    private String resourceTwoType;
+
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)
     private String isRecommend;

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

@@ -24,12 +24,17 @@
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
             IFNULL (rt.NAME,'') AS resourceTypeName,
+            IFNULL (t1.RESOURCE_TWO_TYPE,'') AS resourceTwoType,
+            IFNULL (rt2.NAME,'') AS resourceTwoTypeName,
+            CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE) AS resourceAllType,
+            CONCAT(rt.NAME,',',rt2.NAME) AS resourceALLTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             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 ='NOT_DELETE'
         LEFT JOIN RESOURCE_FILE rf ON t2.FILE_ID= rf.FILE_ID
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
         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,8 +69,11 @@
         <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 test="param.resourceType!=null and param.resourceType != ''">
+            and t1.RESOURCE_TYPE=#{param.resourceType}
+        </if>
+        <if test="param.resourceTwoType!=null and param.resourceTwoType != ''">
+            and t1.RESOURCE_TWO_TYPE=#{param.resourceTwoType}
         </if>
         <if test="param.suffix!=null and param.suffix != ''">
             and t2.EXTEND_NAME like CONCAT('%',#{param.suffix}, '%')
@@ -120,15 +128,18 @@
         <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 test="param.resourceType!=null and param.resourceType != ''">
+            and t1.RESOURCE_TYPE=#{param.resourceType}
+        </if>
+        <if test="param.resourceTwoType!=null and param.resourceTwoType != ''">
+            and t1.RESOURCE_TWO_TYPE=#{param.resourceTwoType}
         </if>
         <if test="param.suffix!=null and param.suffix != ''">
             and t2.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'
+                and TRIM(t1.IS_RECOMMEND)='1'
             </if>
 
         </if>
@@ -167,6 +178,10 @@
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
             IFNULL (rt.NAME,'') AS resourceTypeName,
+            IFNULL (t1.RESOURCE_TWO_TYPE,'') AS resourceTwoType,
+            IFNULL (rt2.NAME,'') AS resourceTwoTypeName,
+            CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE) AS resourceAllType,
+            CONCAT(rt.NAME,',',rt2.NAME) AS resourceALLTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue,
             IFNULL (t1.COURSE_ID,'') as courseId,
@@ -179,6 +194,7 @@
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN RESOURCE_FILE rf ON t2.FILE_ID= rf.FILE_ID
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
         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'
@@ -207,10 +223,15 @@
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
             IFNULL (rt.NAME,'') AS resourceTypeName,
+            IFNULL (t1.RESOURCE_TWO_TYPE,'') AS resourceTwoType,
+            IFNULL (rt2.NAME,'') AS resourceTwoTypeName,
+            CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE) AS resourceAllType,
+            CONCAT(rt.NAME,',',rt2.NAME) AS resourceALLTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue
         FROM COURSE_AUDIT_RECORD t1
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.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'