素材库代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/MaterrialLibraryController.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;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.disk.domain.MaterrialLibrary;
 import vip.xiaonuo.disk.param.MaterrialLibraryAddParam;
 import vip.xiaonuo.disk.param.MaterrialLibraryEditParam;
 import vip.xiaonuo.disk.param.MaterrialLibraryIdParam;
@@ -61,7 +59,6 @@ public class MaterrialLibraryController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取素材库分页")
-    @SaCheckPermission("/disk/library/page")
     @GetMapping("/disk/library/page")
     public CommonResult<Page<MaterrialLibraryVo>> page(MaterrialLibraryPageParam materrialLibraryPageParam) {
         return CommonResult.data(materrialLibraryService.page(materrialLibraryPageParam));
@@ -76,7 +73,6 @@ public class MaterrialLibraryController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加素材库")
     @CommonLog("添加素材库")
-    @SaCheckPermission("/disk/library/add")
     @PostMapping("/disk/library/add")
     public CommonResult<String> add(@RequestBody @Valid MaterrialLibraryAddParam materrialLibraryAddParam) {
         materrialLibraryService.add(materrialLibraryAddParam);
@@ -92,7 +88,6 @@ public class MaterrialLibraryController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑素材库")
     @CommonLog("编辑素材库")
-    @SaCheckPermission("/disk/library/edit")
     @PostMapping("/disk/library/edit")
     public CommonResult<String> edit(@RequestBody @Valid MaterrialLibraryEditParam materrialLibraryEditParam) {
         materrialLibraryService.edit(materrialLibraryEditParam);
@@ -108,7 +103,6 @@ public class MaterrialLibraryController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除素材库")
     @CommonLog("删除素材库")
-    @SaCheckPermission("/disk/library/delete")
     @PostMapping("/disk/library/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<MaterrialLibraryIdParam> materrialLibraryIdParamList) {
@@ -124,9 +118,8 @@ public class MaterrialLibraryController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取素材库详情")
-    @SaCheckPermission("/disk/library/detail")
     @GetMapping("/disk/library/detail")
-    public CommonResult<MaterrialLibrary> detail(@Valid MaterrialLibraryIdParam materrialLibraryIdParam) {
+    public CommonResult<MaterrialLibraryVo> detail(@Valid MaterrialLibraryIdParam materrialLibraryIdParam) {
         return CommonResult.data(materrialLibraryService.detail(materrialLibraryIdParam));
     }
 

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

@@ -77,7 +77,7 @@ public class StorageReController {
     /**
      * 提交改变存储空间大小的申请
      *
-     * @param capacityAuditInfo 申请信息
+     * @param  capacityReAuditInfo
      * @return 提交结果
      */
     @PostMapping("/storagere/applyChangeStorage")

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

@@ -19,6 +19,8 @@ import vip.xiaonuo.disk.domain.MaterrialLibrary;
 import vip.xiaonuo.disk.param.MaterrialLibraryPageParam;
 import vip.xiaonuo.disk.vo.materrial.MaterrialLibraryVo;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 素材库Mapper接口
@@ -30,4 +32,6 @@ public interface MaterrialLibraryMapper extends BaseMapper<MaterrialLibrary> {
 
 
     Page<MaterrialLibraryVo> page(@Param("page") Page<Object> objectPage, @Param("materrialLibraryPageParam") MaterrialLibraryPageParam materrialLibraryPageParam);
+
+    MaterrialLibraryVo detail(String id);
 }

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

@@ -37,4 +37,33 @@
         order by a.UPDATE_TIME desc
     </select>
 
+    <select id="detail" resultType="vip.xiaonuo.disk.vo.materrial.MaterrialLibraryVo">
+        SELECT a.ID,
+        a.COURSE_ID courseId,
+        a.DELETE_FLAG deleteFlag,
+        a.USERFILE_ID userfileId,
+        f.FILE_ID fileId,
+        f.FILE_NAME fileName,
+        a.COLLEGE_ID collegeId,
+        b.name collegeName,
+        a.MAJOR_ID,
+        e.major_name majorName,
+        a.COLLEGE_TWO_ID,
+        c.name collegeTwoName,
+        a.COLLEGE_THREE_ID,
+        d.name collegeThreeName,
+        a.RESOURCE_DESC resourceDesc,
+        a.CREATE_TIME createTime,
+        a.CREATE_USER createUser,
+        a.UPDATE_TIME updateTime,
+        a.UPDATE_USER updateUser
+        FROM SYSDBA."materrial_library" a
+        LEFT JOIN college b ON   a.COLLEGE_ID = b.id
+        LEFT JOIN college c ON   a.COLLEGE_ID = c.id
+        LEFT JOIN college d ON   a.COLLEGE_ID = d.id
+        LEFT JOIN major e   ON   a.MAJOR_ID = d.id
+        LEFT JOIN RESOURCE_USERFILE f ON a.USERFILE_ID=f.USER_FILE_ID
+        where a.ID=#{id}
+    </select>
+
 </mapper>

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

@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 素材库Id参数
@@ -30,6 +31,6 @@ public class MaterrialLibraryIdParam {
 
     /** 主键id */
     @ApiModelProperty(value = "主键id", required = true)
-    @NotBlank(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private String id;
 }

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

@@ -69,7 +69,7 @@ public interface MaterrialLibraryService extends IService<MaterrialLibrary> {
      * @author pans
      * @date  2025/07/01 16:16
      */
-    MaterrialLibrary detail(MaterrialLibraryIdParam materrialLibraryIdParam);
+    MaterrialLibraryVo detail(MaterrialLibraryIdParam materrialLibraryIdParam);
 
     /**
      * 获取素材库详情

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

@@ -76,8 +76,9 @@ public class MaterrialLibraryServiceImpl extends ServiceImpl<MaterrialLibraryMap
     }
 
     @Override
-    public MaterrialLibrary detail(MaterrialLibraryIdParam materrialLibraryIdParam) {
-        return this.queryEntity(materrialLibraryIdParam.getId());
+    public MaterrialLibraryVo detail(MaterrialLibraryIdParam materrialLibraryIdParam) {
+        MaterrialLibraryVo  detail= materrialLibraryMapper.detail(materrialLibraryIdParam.getId());
+        return detail;
     }
 
     @Override