bookshelfplus/bookshelfplus
1
0
Fork 0
mirror of https://gitee.com/bookshelfplus/bookshelfplus synced 2025-09-01 22:53:29 +08:00
Code Issues Projects Releases Wiki Activity GitHub Gitee

所有convert函数添加判空；上传成功回调函数修Bug

Browse Source
This commit is contained in:
小墨
2022-04-16 00:15:59 +08:00
parent 3dac60ced6
commit 67bb897361
9 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/BookController.java
View File

@@ -199,6 +199,9 @@ public class BookController extends BaseController {
private BookVO convertFromModel(BookModel bookModel) {
if(bookModel == null) {
return null;
}
BookVO bookVO = new BookVO();
BeanUtils.copyProperties(bookModel, bookVO);
return bookVO;

67
bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/FileController.java
View File

@@ -70,6 +70,9 @@ public class FileController extends BaseController {
}
private FileVO convertFileVOFromModel(FileModel fileModel) {
if (fileModel == null) {
return null;
}
FileVO fileVO = new FileVO();
BeanUtils.copyProperties(fileModel, fileVO);
fileVO.setFileCreateAt(fileModel.getFileCreateAt().getTime());
@@ -97,6 +100,9 @@ public class FileController extends BaseController {
}
private FileObjectVO convertFileObjectVOFromModel(FileObjectModel fileObjectModel) {
if (fileObjectModel == null) {
return null;
}
FileObjectVO fileObjectVO = new FileObjectVO();
BeanUtils.copyProperties(fileObjectModel, fileObjectVO);
try {
@@ -159,13 +165,13 @@ public class FileController extends BaseController {
String bookSaveFolder = QCloudCosUtils.BOOK_SAVE_FOLDER;
// 判断对象是否存在
Boolean isExist = qCloudCosUtils.doesObjectExist(bookSaveFolder, fileName);
Boolean isExist = qCloudCosUtils.doesObjectExist(bookSaveFolder, fileSha1);
switch (httpMethodName) {
case PUT:
// 上传文件
if (isExist) throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "文件已存在");
fileObjectService.uploadFile(fileId, fileName, bookSaveFolder + fileName, fileSize,
fileObjectService.uploadFile(fileId, fileName, bookSaveFolder + fileSha1, fileSize,
fileSha1, fileExt, fileName, FileStorageMediumEnum.QCLOUD_COS, "", lastModified);
break;
case GET:
@@ -178,7 +184,7 @@ public class FileController extends BaseController {
throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "httpMethod 参数暂不支持");
}
String url = qCloudCosUtils.generatePresignedUrl(userModel.getId(), httpMethodName, bookSaveFolder, fileName, 30, urlGUID);
String url = qCloudCosUtils.generatePresignedUrl(userModel.getId(), httpMethodName, bookSaveFolder, fileSha1, 30, urlGUID);
Map map = new HashMap();
map.put("url", url);
@@ -201,7 +207,7 @@ public class FileController extends BaseController {
// @RequestParam() Map<String, String> params,
@RequestParam(value = "event") String eventStr,
@RequestParam(value = "context", required = false) String contextStr
) throws BusinessException {
) throws BusinessException, InvocationTargetException, IllegalAccessException {
JSONObject eventObject;
@@ -211,6 +217,7 @@ public class FileController extends BaseController {
throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "event参数不合法");
}
String cosBucketName, appid, cosRegion, eventName, key;
try {
// 获取 Records 节点
JSONArray records = eventObject.getJSONArray("Records");
@@ -218,42 +225,48 @@ public class FileController extends BaseController {
JSONObject cos = record.getJSONObject("cos");
JSONObject cosBucket = cos.getJSONObject("cosBucket");
String appid = cosBucket.getString("appid");
String cosBucketName = cosBucket.getString("name");
appid = cosBucket.getString("appid");
cosBucketName = cosBucket.getString("name");
if (Objects.equals(appid, "1253970026") && Objects.equals(cosBucketName, "testpic")) {
// 执行的是腾讯云云函数的测试请求
return CommonReturnType.create("您的云函数配置成功。");
}
String cosRegion = cosBucket.getString("cosRegion");
cosRegion = cosBucket.getString("cosRegion");
JSONObject cosObject = cos.getJSONObject("cosObject");
String key = cosObject.getString("key");
// 获取 /1000000000/bookshelfplus/fileName 中的 fileName 部分
key = cosObject.getString("key");
// 获取 /1000000000/bookshelfplus/fileSha1 中的 fileSha1 部分
key = key.substring(key.indexOf("/", key.indexOf("/", key.indexOf("/") + 1) + 1) + 1);
JSONObject event = record.getJSONObject("event");
String eventName = event.getString("eventName");
eventName = event.getString("eventName");
// 判断是否是由系统的存储桶触发
if (qCloudCosConfig.getBucketName().equals(cosBucketName + "-" + appid) &&
qCloudCosConfig.getRegionName().equals(cosRegion)) {
// 是由系统的存储桶触发的，则认为是文件上传成功
// 通过文件 key 获取文件对象
FileObjectModel fileObject = fileObjectService.getFileObjectByFilePath(QCloudCosUtils.BOOK_SAVE_FOLDER + key);
// 更新文件状态
Boolean isSuccess = fileObjectService.updateFileStatus(fileObject.getId(), "SUCCESS");
if (!isSuccess) {
throw new BusinessException(BusinessErrorCode.UNKNOWN_ERROR, "更新文件状态失败");
}
} else {
// 不是由系统的存储桶触发的
return CommonReturnType.create("Not triggered by the bucket specified in the configuration file, skip.");
}
} catch (Exception e) {
throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "JSON解析出错！");
}
// 判断是否是由系统的存储桶触发
if (qCloudCosConfig.getBucketName().equals(cosBucketName + "-" + appid) &&
qCloudCosConfig.getRegionName().equals(cosRegion) &&
"cos:ObjectCreated:Put".equals(eventName)) {
// 是由系统的存储桶触发的，则认为是文件上传成功
// 通过文件 key 获取文件对象
FileObjectModel fileObject = fileObjectService.getFileObjectByFilePath(QCloudCosUtils.BOOK_SAVE_FOLDER + key);
// 如果找不到，就抛出异常
if (fileObject == null) {
throw new BusinessException(BusinessErrorCode.PARAMETER_VALIDATION_ERROR, "文件不存在！");
}
// 更新文件状态
Boolean isSuccess = fileObjectService.updateFileStatus(fileObject.getId(), "SUCCESS");
if (!isSuccess) {
throw new BusinessException(BusinessErrorCode.UNKNOWN_ERROR, "更新文件状态失败");
}
} else {
// 不是由系统的存储桶触发的
return CommonReturnType.create("Not triggered by the bucket specified in the configuration file, skip.");
}
return CommonReturnType.create("success");
}
}

7
bookshelfplus/src/main/java/plus/bookshelf/Controller/Controller/StatusController.java
View File

@@ -1,7 +1,5 @@
package plus.bookshelf.Controller.Controller;
import com.sun.management.OperatingSystemMXBean;
import com.sun.management.ThreadMXBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
@@ -10,11 +8,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import plus.bookshelf.Common.Response.CommonReturnType;
import java.lang.management.ManagementFactory;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@Api(tags = "网站后台状态检测")
@Controller("status")
@RequestMapping("/status")

4
bookshelfplus/src/main/java/plus/bookshelf/Dao/Mapper/BookDOMapper.java
View File

@@ -1,11 +1,11 @@
package plus.bookshelf.Dao.Mapper;
import java.util.List;
import org.springframework.stereotype.Repository;
import plus.bookshelf.Dao.DO.BookDO;
import plus.bookshelf.Dao.DO.BookDOExample;
import java.util.List;
@Repository // 添加这个注解，Autowired的时候idea就不会报错了
public interface BookDOMapper {
/**

3
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/BookServiceImpl.java
View File

@@ -256,6 +256,9 @@ public class BookServiceImpl implements BookService {
}
private List<BookModel> convertFromDataObjecctList(List<BookDO> bookDOs) {
if(bookDOs == null) {
return null;
}
List<BookModel> bookModels = new ArrayList<>();
for (BookDO bookDO : bookDOs) {
bookModels.add(convertFromDataObjecct(bookDO));

8
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/FileObjectServiceImpl.java
View File

@@ -59,6 +59,9 @@ public class FileObjectServiceImpl implements FileObjectService {
}
private FileObjectModel convertFromDataObject(FileObjectDO fileObjectDO) throws InvocationTargetException, IllegalAccessException {
if(fileObjectDO == null) {
return null;
}
FileObjectModel fileObjectModel = new FileObjectModel();
BeanUtils.copyProperties(fileObjectDO, fileObjectModel);
return fileObjectModel;
@@ -80,7 +83,10 @@ public class FileObjectServiceImpl implements FileObjectService {
return affectRows > 0;
}
private FileObjectDO convertFromFileObjectModel(FileObjectModel fileObjectModel) throws InvocationTargetException, IllegalAccessException {
private FileObjectDO convertFromFileObjectModel(FileObjectModel fileObjectModel) {
if(fileObjectModel == null) {
return null;
}
FileObjectDO fileObjectDO = new FileObjectDO();
BeanUtils.copyProperties(fileObjectModel, fileObjectDO);
return fileObjectDO;

5
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/FileServiceImpl.java
View File

@@ -61,7 +61,10 @@ public class FileServiceImpl implements FileService {
return fileModels;
}
private FileModel convertFromDataObject(FileDO fileDO) throws InvocationTargetException, IllegalAccessException {
private FileModel convertFromDataObject(FileDO fileDO) {
if(fileDO == null) {
return null;
}
FileModel fileModel = new FileModel();
BeanUtils.copyProperties(fileDO, fileModel);
return fileModel;

6
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/ScheduleTaskServiceImpl.java.bak
View File

@@ -125,6 +125,9 @@ public class ScheduleTaskServiceImpl {
}
private static ScheduleTaskDO convertToDataObject(ScheduleTaskModel scheduleTaskModel) {
if (scheduleTaskModel == null) {
return null;
}
ScheduleTaskDO scheduleTaskDO = new ScheduleTaskDO();
BeanUtils.copyProperties(scheduleTaskModel, scheduleTaskDO);
scheduleTaskDO.setAction(String.valueOf(scheduleTaskModel.getAction()));
@@ -132,6 +135,9 @@ public class ScheduleTaskServiceImpl {
}
private static ScheduleTaskModel convertToModel(ScheduleTaskDO scheduleTaskDO) {
if (scheduleTaskDO == null) {
return null;
}
ScheduleTaskModel scheduleTaskModel = new ScheduleTaskModel();
BeanUtils.copyProperties(scheduleTaskDO, scheduleTaskModel);
scheduleTaskModel.setAction(ScheduleTaskActionEnum.valueOf(scheduleTaskDO.getAction()));

5
bookshelfplus/src/main/java/plus/bookshelf/Service/Impl/ThirdPartyUserServiceImpl.java
View File

@@ -216,7 +216,10 @@ public class ThirdPartyUserServiceImpl implements ThirdPartyUserService {
return false;
}
private ThirdPartyUserModel convertThirdPartyUserDOToModel(ThirdPartyUserDO thirdPartyUserDO) throws InvocationTargetException, IllegalAccessException {
private ThirdPartyUserModel convertThirdPartyUserDOToModel(ThirdPartyUserDO thirdPartyUserDO) {
if (thirdPartyUserDO == null) {
return null;
}
ThirdPartyUserModel thirdPartyUserModel = new ThirdPartyUserModel();
BeanUtils.copyProperties(thirdPartyUserDO, thirdPartyUserModel);
return thirdPartyUserModel;