From ad9b37db63b560793d3a3ea3b08e556239274962 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 19 Aug 2023 19:24:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/wxjw/service/GetSheetService.java | 2 -- src/main/java/com/wxjw/service/InsertTableService.java | 3 ++- src/main/java/com/wxjw/service/UploadSheetService.java | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/wxjw/service/GetSheetService.java b/src/main/java/com/wxjw/service/GetSheetService.java index 6647c3e..63e4a14 100644 --- a/src/main/java/com/wxjw/service/GetSheetService.java +++ b/src/main/java/com/wxjw/service/GetSheetService.java @@ -67,8 +67,6 @@ public class GetSheetService { Cell cell = iterator.next(); title = (title == null || title.isEmpty() ? new StringBuilder() : title).append(cell.toString()); } - // 获取 Header - Iterator headerRow = getEntitySheet.getRow(1).cellIterator(); // 获取总行数 ArrayList> line = new ArrayList<>(); String[] rowMax = new String[getEntitySheet.getRow(1).getPhysicalNumberOfCells()]; diff --git a/src/main/java/com/wxjw/service/InsertTableService.java b/src/main/java/com/wxjw/service/InsertTableService.java index 6e458e9..063ae69 100644 --- a/src/main/java/com/wxjw/service/InsertTableService.java +++ b/src/main/java/com/wxjw/service/InsertTableService.java @@ -7,6 +7,7 @@ import com.wxjw.dal.pojo.ErrorCode; import com.wxjw.dal.pojo.data.RetrieveFiles.InsertTableData; import com.wxjw.dal.pojo.entity.ExcelInfoEntity; import lombok.Getter; +import org.jetbrains.annotations.NotNull; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -26,7 +27,7 @@ public class InsertTableService { @Getter private String validationErrorMessage = null; - public void insertLogic(InsertTableData resultBody, ExcelInfoMapper excelInfoMapper) { + public void insertLogic(@NotNull InsertTableData resultBody, @NotNull ExcelInfoMapper excelInfoMapper) { // 搜索数据是否存在 ArrayList excelInfoList = (ArrayList) excelInfoMapper.getAllExcelFilesNameNoRepetition(resultBody.getFile_name()); if (!excelInfoList.isEmpty()) { diff --git a/src/main/java/com/wxjw/service/UploadSheetService.java b/src/main/java/com/wxjw/service/UploadSheetService.java index 27b2346..10515d8 100644 --- a/src/main/java/com/wxjw/service/UploadSheetService.java +++ b/src/main/java/com/wxjw/service/UploadSheetService.java @@ -112,8 +112,11 @@ public class UploadSheetService { .setUpdateBy(excelInfo.getUpdateBy()) .setCreateTime(excelInfo.getCreateTime()) .setUpdateBy(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - excelInfoMapper.updateExcelInfo(excelInfoUpdate); - returnResult = ResultUtil.success(); + if (excelInfoMapper.updateExcelInfo(excelInfoUpdate)) { + returnResult = ResultUtil.success(); + } else { + returnResult = ResultUtil.error(ErrorCode.DATA_UPDATE_FAILURE); + } } else { returnResult = ResultUtil.error(ErrorCode.DATA_IS_EMPTY); }