From d7a01756bf7a08038d9fcdf36262816d5d2834ac Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Fri, 18 Aug 2023 16:40:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wxjw/controller/openapi/DeleteFileController.java | 6 ++++-- src/main/java/com/wxjw/dal/pojo/ErrorCode.java | 1 + src/main/java/com/wxjw/service/DeleteFileService.java | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/wxjw/controller/openapi/DeleteFileController.java b/src/main/java/com/wxjw/controller/openapi/DeleteFileController.java index 76317dd..e57bf4d 100644 --- a/src/main/java/com/wxjw/controller/openapi/DeleteFileController.java +++ b/src/main/java/com/wxjw/controller/openapi/DeleteFileController.java @@ -5,7 +5,7 @@ import com.wxjw.common.ResultUtil; import com.wxjw.dal.dao.ExcelInfoMapper; import com.wxjw.dal.pojo.ErrorCode; import com.wxjw.dal.pojo.data.DeleteFile.DeleteFileData; -import com.wxjw.dal.pojo.entity.ExcelInfoEntity; +import com.wxjw.service.DeleteFileService; import jakarta.annotation.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -28,7 +28,9 @@ public class DeleteFileController { @PostMapping("/file") public ResponseEntity> deleteFile(@RequestBody DeleteFileData requestBody) { if ("deletefile".equals(requestBody.getAction())) { - return d; + DeleteFileService deleteFileService = new DeleteFileService(excelInfoMapper); + deleteFileService.deleteFile(requestBody); + return deleteFileService.getReturnResult(); } else { return ResultUtil.error(ErrorCode.PARAMETER_ERROR); } diff --git a/src/main/java/com/wxjw/dal/pojo/ErrorCode.java b/src/main/java/com/wxjw/dal/pojo/ErrorCode.java index aa2f881..aed615e 100644 --- a/src/main/java/com/wxjw/dal/pojo/ErrorCode.java +++ b/src/main/java/com/wxjw/dal/pojo/ErrorCode.java @@ -15,6 +15,7 @@ public enum ErrorCode { PARAMETER_ERROR("ParameterError", 40011, "参数错误", HttpCode.BAD_REQUEST), DATA_DUPLICATION("DataDuplication", 40012, "数据重复", HttpCode.BAD_REQUEST), DATA_WRITE_FAILURE("DataWriteFailure", 40013, "数据写入失败", HttpCode.BAD_REQUEST), + DATA_DELETE_FAILURE("DataDeleteFailure", 40014, "数据删除失败", HttpCode.BAD_REQUEST), FILE_TYPE_IS_INCORRECT("FileTypeIncorrect", 40014, "文件类型错误", HttpCode.BAD_REQUEST), FILE_CREATION_FAILED("FileCreationFailed", 40015, "文件创建失败", HttpCode.BAD_REQUEST), FILE_ALREADY_EXISTS("FileAlreadyExists", 40016, "文件已经存在", HttpCode.BAD_REQUEST), diff --git a/src/main/java/com/wxjw/service/DeleteFileService.java b/src/main/java/com/wxjw/service/DeleteFileService.java index f7ba73a..8b6322d 100644 --- a/src/main/java/com/wxjw/service/DeleteFileService.java +++ b/src/main/java/com/wxjw/service/DeleteFileService.java @@ -31,8 +31,11 @@ public class DeleteFileService { ExcelInfoEntity excelInfo = excelInfoMapper.getExcelForId(requestBody.getNodeId()); if (excelInfo != null && excelInfo.getId() != null) { // 查找到数据执行删除 - excelInfoMapper.deleteExcelForId(excelInfo.getId()); - returnResult = ResultUtil.success("删除成功"); + if (excelInfoMapper.deleteExcelForId(excelInfo.getId())) { + returnResult = ResultUtil.success("删除成功"); + } else { + returnResult = ResultUtil.error(ErrorCode.DATA_DELETE_FAILURE); + } } else { returnResult = ResultUtil.error(ErrorCode.DATA_IS_EMPTY); }