1.附件格式转换bug修复

2.个人资源库与资源管理加入动态判断

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

@@ -99,6 +99,14 @@ public class CourseAuditRecordController {
         String verifyStatus="0";
         if(StringUtils.isNotEmpty(req.getParameter("verifyStatus")))verifyStatus=req.getParameter("verifyStatus");
         param.put("verifyStatus", verifyStatus);
+        //是否是个人资源库，0否1是，默认为0
+        String isSelf="0";
+        if(StringUtils.isNotEmpty(req.getParameter("isSelf")))verifyStatus=req.getParameter("isSelf");
+        if("1".equals(isSelf))
+        {
+            param.put("userId", StpLoginUserUtil.getLoginUser().getId());
+        }
+
         //文件名称
         param.put("fileName", req.getParameter("fileName"));
         param.put("collegeId", req.getParameter("collegeId"));

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

@@ -36,6 +36,9 @@
         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.userId!=null and param.userId != ''">
+            and t1.CREATE_USER=#{param.userId}
+        </if>
         <if test="param.verifyStatus!=null and param.verifyStatus != ''">
             and t1.VERIFY_STATUS=#{param.verifyStatus}
         </if>

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

@@ -146,53 +146,53 @@ public class TranscodingServiceImpl implements TranscodingService {
         ArrayList<String> formatList = new ArrayList<>();
         formatList.add(transcodingResourceReqDTO.getFormat());
         // 判断视频还是图片
-        if (transcodingResourceReqDTO.getTranscodingType() == 0) {
-            try {
-                // 转码视频
-                // mp4 wmv avi flv mpeg mpg rmvb mov 互相转
-                videoConverter.convertAndUpload(fileBean.getFileUrl(), fileBean.getFileId(), new String[]{transcodingResourceReqDTO.getFormat()});
-               //根据文件id修改预览地址
-                if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
-                    ResourceFile newFile = new ResourceFile();
-                    newFile.setFileId(fileBean.getFileId());
-                    newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
-                    resourceFileMapper.updateById(newFile);
-                }else{
+        if(transcodingResourceReqDTO.getTranscodingType()!= null)
+        {
+            if (transcodingResourceReqDTO.getTranscodingType() == 0) {
+                try {
+                    // 转码视频
+                    // mp4 wmv avi flv mpeg mpg rmvb mov 互相转
+                    videoConverter.convertAndUpload(fileBean.getFileUrl(), fileBean.getFileId(), new String[]{transcodingResourceReqDTO.getFormat()});
+                   //根据文件id修改预览地址
+                    if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
+                        ResourceFile newFile = new ResourceFile();
+                        newFile.setFileId(fileBean.getFileId());
+                        newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
+                        resourceFileMapper.updateById(newFile);
+                    }
+                } catch (Exception ex) {
+                    log.error(ex.getMessage());
+                    return CommonResult.error("格式转换失败");
+                }
+            } else if (transcodingResourceReqDTO.getTranscodingType() == 1) {
+                // 转码文档
+                // pdf doc docx ppt pptx xls xlsx
+                // doc转docx，ppt转pptx，xls转xlsx 所有均转pdf
+                // 判断目标格式
+
+                try {
+                    if ("pdf".equals(transcodingResourceReqDTO.getFormat())) {
+                        pdfUtils.convertToPdf(fileBean.getFileUrl(), fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
+                    } else {
+                        officeConverter.convertAndUpload(fileBean.getFileUrl(), fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
+                    }
+                    //根据文件id修改预览地址
                     ResourceFile newFile = new ResourceFile();
                     newFile.setFileId(fileBean.getFileId());
-                    newFile.setPreviewFileUrl(fileBean.getFileUrl());
+                    if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
+                        newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
+                    }else{
+                        newFile.setPreviewFileUrl(fileBean.getFileUrl());
+                    }
                     resourceFileMapper.updateById(newFile);
+                } catch (Exception ex) {
+                    log.error("格式转换:"+ex.getMessage());
+                    return CommonResult.error("格式转换失败");
                 }
-            } catch (Exception ex) {
-                log.error(ex.getMessage());
-                return CommonResult.error("格式转换失败");
-            }
-        } else if (transcodingResourceReqDTO.getTranscodingType() == 1) {
-            // 转码文档
-            // pdf doc docx ppt pptx xls xlsx
-            // doc转docx，ppt转pptx，xls转xlsx 所有均转pdf
-            // 判断目标格式
-
-            try {
-                if ("pdf".equals(transcodingResourceReqDTO.getFormat())) {
-                    pdfUtils.convertToPdf(fileBean.getFileUrl(), fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
-                } else {
-                    officeConverter.convertAndUpload(fileBean.getFileUrl(), fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
-                }
-                //根据文件id修改预览地址
-                ResourceFile newFile = new ResourceFile();
-                newFile.setFileId(fileBean.getFileId());
-                if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
-                    newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
-                }else{
-                    newFile.setPreviewFileUrl(fileBean.getFileUrl());
-                }
-                resourceFileMapper.updateById(newFile);
-            } catch (Exception ex) {
-                log.error("格式转换:"+ex.getMessage());
-                return CommonResult.error("格式转换失败");
             }
-        }else{
+        }
+        else
+        {
             ResourceFile newFile = new ResourceFile();
             newFile.setFileId(fileBean.getFileId());
             newFile.setPreviewFileUrl(fileBean.getFileUrl());