1.资源上传和查询加入归属功能标识

2.给资源详情加入转换状态

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

@@ -44,8 +44,8 @@ public class MinioController {
     }
 
     @PostMapping("/merge")
-    public ResponseEntity<Map<String,Object>> merge(@RequestParam String md5, @RequestParam Integer chunkTotal, @RequestParam String fileSuffix, @RequestParam String fileName, @RequestParam long fileSize) {
-        return ResponseEntity.ok(minioUtil.merge(md5, chunkTotal, fileSuffix,fileSize,fileName));
+    public ResponseEntity<Map<String,Object>> merge(@RequestParam String md5, @RequestParam Integer chunkTotal, @RequestParam String fileSuffix, @RequestParam String fileName, @RequestParam long fileSize, @RequestParam String affiliationFuncType) {
+        return ResponseEntity.ok(minioUtil.merge(md5, chunkTotal, fileSuffix,fileSize,fileName,affiliationFuncType));
     }
 
 

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

@@ -120,6 +120,7 @@ public class ResourceRecordController {
     @GetMapping("/disk/courseauditrecord/courceDownList")
     public CommonResult<Page<Map<String,Object>>> courceDownList(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
         Map param =new HashMap();
+
         //是否是视频资源，0否1是，默认为否
         List<String> extendNameList = new ArrayList<>();
         String isVedio="0";
@@ -131,6 +132,8 @@ public class ResourceRecordController {
         }
         //文件名称
         param.put("fileName", req.getParameter("fileName"));
+        //功能归属表时，0资源库1课程素材库，默认属于资源库
+        param.put("affiliationFuncType",req.getParameter("affiliationFuncType"));
         Page<Map<String,Object>> list=courseAuditRecordService.courceDownList(param);
         return CommonResult.data(list);
     }
@@ -171,6 +174,8 @@ public class ResourceRecordController {
         param.put("resourceTwoType", req.getParameter("resourceTwoType"));
         param.put("resourceThreeType", req.getParameter("resourceThreeType"));
         param.put("suffix", req.getParameter("suffix"));
+        //功能归属表时，0资源库1课程素材库，默认属于资源库
+        param.put("affiliationFuncType",req.getParameter("affiliationFuncType"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
         return CommonResult.data(list);
     }
@@ -230,6 +235,8 @@ public class ResourceRecordController {
         param.put("resourceTwoType", req.getParameter("resourceTwoType"));
         param.put("resourceThreeType", req.getParameter("resourceThreeType"));
         param.put("suffix", req.getParameter("suffix"));
+        //功能归属表时，0资源库1课程素材库，默认属于资源库
+        param.put("affiliationFuncType",req.getParameter("affiliationFuncType"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryResourceCentreList(param);
         return CommonResult.data(list);
     }

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

@@ -28,6 +28,8 @@ public class UploadFile {
     @Schema(description = "md5码")
     private String identifier;
 
+    @Schema(description = "归属功能标识，0资源库1课程素材库")
+    private String affiliationFuncType;
 
 
 }

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

@@ -48,6 +48,9 @@
         LEFT JOIN SYS_ORG 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.affiliationFuncType!=null and param.affiliationFuncType != ''">
+            and t2.FUNC_TYPE =#{param.affiliationFuncType}
+        </if>
         <if test="param.userId!=null and param.userId != ''">
             and t1.CREATE_USER=#{param.userId}
         </if>
@@ -114,6 +117,9 @@
         LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER t7 ON t1.CREATE_USER =t7.ID AND t7.DELETE_FLAG ='NOT_DELETE'
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
+        <if test="param.affiliationFuncType!=null and param.affiliationFuncType != ''">
+            and t2.FUNC_TYPE =#{param.affiliationFuncType}
+        </if>
         <if test="param.startTime!=null and param.startTime != ''">
             and t1.CREATE_TIME &gt;=#{param.startTime}
         </if>
@@ -230,6 +236,10 @@
             IFNULL (t1.COVER_IMAGE,'') AS coverImage,
             IFNULL (CAST(t7.AVATAR AS VARCHAR),'') AS avatar,
             IFNULL (CAST(t6.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath,
+            CASE
+                WHEN rf.PRIVIEW_FILE_URL IS NOT null THEN '1'
+                ELSE '0'
+            END AS isConvert,
             IFNULL (TRIM(t1.IS_RECOMMEND),'') AS isRecommend,
             IFNULL (TRIM(t1.IS_HOT),'') AS isHot
         FROM RESOURCE_RECORD t1
@@ -310,6 +320,9 @@
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
         AND t1.AUTH_TYPE ='0'
         AND t1.VERIFY_STATUS='2'
+        <if test="param.affiliationFuncType!=null and param.affiliationFuncType != ''">
+            and t2.FUNC_TYPE =#{param.affiliationFuncType}
+        </if>
         <if test="param.fileName!=null and param.fileName != ''">
             and t2.FILE_NAME like CONCAT('%', #{param.fileName}, '%')
         </if>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/MinioUtil.java

@@ -119,6 +119,9 @@ public class MinioUtil {
 
         List<ResourceUserFile> noExitList = new ArrayList<>();
         md5List.forEach(item -> {
+                //功能归属表时，0资源库1课程素材库，默认属于资源库
+                String affiliationFuncType="1";
+                if(StringUtils.isNotEmpty(item.getAffiliationFuncType()))affiliationFuncType=item.getAffiliationFuncType();
                 //根据文件名称查询userFileId
                 Map<String, Object> param = new HashMap<>();
                 //看看该md5批次号有没有对应存在的文件
@@ -133,6 +136,7 @@ public class MinioUtil {
                        BeanUtil.copyProperties(userFile, newUserFile);
                        newUserFile.setIsDir(0);
                        newUserFile.setMd5(item.getMd5());
+                       newUserFile.setFuncType(affiliationFuncType);
                        resourceUserFileMapper.insert(newUserFile);
                        noExitList.add(newUserFile);
                    }else{
@@ -142,6 +146,7 @@ public class MinioUtil {
                        newUserFile.setFileName(fileName+"("+userFileCount+")");
                        newUserFile.setMd5(item.getMd5());
                        newUserFile.setIsDir(0);
+                       newUserFile.setFuncType(affiliationFuncType);
                        resourceUserFileMapper.insert(newUserFile);
                        noExitList.add(newUserFile);
                    }
@@ -282,7 +287,7 @@ public class MinioUtil {
      * @param fileSuffix
      * @return
      */
-    public Map<String,Object> merge(String md5, Integer chunkTotal, String fileSuffix,long fileSize,String fileName) {
+    public Map<String,Object> merge(String md5, Integer chunkTotal, String fileSuffix,long fileSize,String fileName,String affiliationFuncType) {
         Map<String,Object> rs=new HashMap<>();
 
         fileSuffix=fileSuffix.substring(1, fileSuffix.length());
@@ -327,7 +332,7 @@ public class MinioUtil {
 
         String url = fileUrl;
         logger.info("插入的的url是：" + url);
-        Map<String,Object> map = this.insertUrl(url, fileSize,md5,fileName);
+        Map<String,Object> map = this.insertUrl(url, fileSize,md5,fileName,affiliationFuncType);
         Boolean deleteResult = this.deleteChunks(md5);
         logger.info(map.toString());
         logger.info(deleteResult.toString());
@@ -361,7 +366,11 @@ public class MinioUtil {
      * @param url
      * @return
      */
-    public Map<String,Object> insertUrl(String url,long fileSize,String md5,String fileName) {
+    public Map<String,Object> insertUrl(String url,long fileSize,String md5,String fileName,String affiliationFuncType) {
+        //功能归属表时，0资源库1课程素材库，默认属于资源库
+        String funcType="1";
+        if(StringUtils.isNotEmpty(affiliationFuncType))funcType=affiliationFuncType;
+
         ResourceFile file = new ResourceFile(url,fileSize,3,md5, StpLoginUserUtil.getLoginUser().getId());
         resourceFileMapper.insert(file);
 
@@ -371,6 +380,7 @@ public class MinioUtil {
         resourceUserFile.setIsCollet("0");
         try {
             resourceUserFile.setIsCollet("0");
+            resourceUserFile.setFuncType(funcType);
             resourceUserFileMapper.insert(resourceUserFile);
 
         } catch (Exception e) {