From 14821e28286d773ad5ff2c13510e39c5eb117daf Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 05 七月 2024 13:46:32 +0800
Subject: [PATCH] update
---
exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExResourceServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExResourceServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExResourceServiceImpl.java
index 52ebb5b..452ec96 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExResourceServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExResourceServiceImpl.java
@@ -5,17 +5,18 @@
import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.domain.entity.SysUser;
import com.gkhy.exam.common.enums.PrivatizeEnum;
+import com.gkhy.exam.common.enums.ResourceTypeEnum;
import com.gkhy.exam.common.enums.UserTypeEnum;
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.ExResource;
-import com.gkhy.exam.system.domain.vo.UploadObjectVO;
import com.gkhy.exam.system.mapper.ExResourceMapper;
import com.gkhy.exam.system.service.ExResourceService;
import com.gkhy.exam.system.service.SysCommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -83,9 +84,14 @@
@Override
public int insertResource(ExResource resource) {
- checkUserAllowed(resource);
- if(!checkNameUnique(resource)){
- throw new ApiException("资源名称已存在");
+ if(resource.getResourceType().equals(ResourceTypeEnum.VIDEO.getCode())||resource.getResourceType().equals(ResourceTypeEnum.AUDIO.getCode())){
+ if(resource.getResourceLength()==null){
+ throw new ApiException("视频或者音频时长不能为空");
+ }
+ }else{
+ if(resource.getDocPage()==null){
+ throw new ApiException("文档页数不能为空");
+ }
}
SysUser user=SecurityUtils.getLoginUser().getUser();
if(user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
@@ -93,19 +99,13 @@
}else{
resource.setCompanyId(user.getCompanyId());
}
- UploadObjectVO uploadObjectVO =commonService.doUpload(resource.getFile());
- resource.setResourceUri(uploadObjectVO.getPath());
- resource.setVideoVid(uploadObjectVO.getFilename());
- resource.setResourceSize(uploadObjectVO.getSize());
+ checkUserAllowed(resource);
+ if(!checkNameUnique(resource)){
+ throw new ApiException("资源名称已存在");
+ }
resource.setCreateBy(SecurityUtils.getUsername());
int row=baseMapper.insert(resource);
if(row<1){
- try {
- //删除原文件
- commonService.removeFile(uploadObjectVO.getPath());
- }catch (Exception e){
- log.error("新增资源,删除文件失败="+e.getMessage());
- }
throw new ApiException("新增资源失败");
}
return row;
@@ -113,6 +113,15 @@
@Override
public int updateResource(ExResource resource) {
+ if(resource.getResourceType().equals(ResourceTypeEnum.VIDEO.getCode())||resource.getResourceType().equals(ResourceTypeEnum.AUDIO.getCode())){
+ if(resource.getResourceLength()==null){
+ throw new ApiException("视频或者音频时长不能为空");
+ }
+ }else{
+ if(resource.getDocPage()==null){
+ throw new ApiException("文档页数不能为空");
+ }
+ }
checkUserAllowed(resource);
if(!checkNameUnique(resource)){
throw new ApiException("资源名称已存在");
@@ -138,6 +147,7 @@
}
@Override
+ @Transactional(rollbackFor = RuntimeException.class)
public int deleteResourceById(Long resourceId) {
//校验资源是否绑定
checkUserAllowed(baseMapper.selectById(resourceId));
@@ -147,7 +157,7 @@
throw new ApiException("删除资源失败");
}
//删除文件
- commonService.removeFile(resource.getResourceUri());
+ commonService.removeMinioFile(resourceId,resource.getResourcePath());
return row;
}
--
Gitblit v1.9.2