From f1fd8ee6c29b7d12584319b09ebe681e6972fece Mon Sep 17 00:00:00 2001
From: qyx <565485304@qq.com>
Date: Mon, 9 Aug 2021 11:02:05 +0800
Subject: [PATCH] =?UTF-8?q?[Bug=E4=BF=AE=E5=A4=8D](master):=20=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98=E6=9C=AC=E5=9C=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

暂存本地代码
---
 .../formdata/service/impl/FormdataServiceImpl.java   |  4 ++--
 .../uploadnew/listener/EasyExcelListener.java        |  2 +-
 .../uploadnew/rest/TbUploadFileNewController.java    | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java
index e7e1e02..aafac54 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java
@@ -150,14 +150,14 @@ public class FormdataServiceImpl implements FormdataService {
     @Override
     public List<FormdataDto> parseFileAndSaveToDB(MultipartFile file) {
         List<Formdata> formData;
-        // 1. todo 先进行解析 excel 文件
+        // 先进行解析 excel 文件
         try {
             InputStream inputStream = file.getInputStream();
             EasyExcelListener listener = new EasyExcelListener();
             EasyExcelFactory.read(inputStream, ExcelDataDTO.class, listener).sheet().doRead();
             //获取到解析后的数据
             formData = listener.getData();
-            // 2. todo 把解析后的结果进行入库
+            // 2. 把解析后的结果进行入库
             formdataRepository.saveAll(formData);
             return formdataMapper.toDto(formData);
         } catch (Exception e) {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/listener/EasyExcelListener.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/listener/EasyExcelListener.java
index 8c247f1..7637653 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/listener/EasyExcelListener.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/listener/EasyExcelListener.java
@@ -41,7 +41,7 @@ public class EasyExcelListener extends AnalysisEventListener<ExcelDataDTO> {
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-        log.info("解析完成");
+        log.info("解析完成， 共解析到 {} 条数据", formDataList.size());
     }
 
     public List<Formdata> getData() {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java
index aa2a7a2..dfa779a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java
@@ -157,20 +157,22 @@ public class TbUploadFileNewController {
         if (null == files) {
             return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_FILE_INPUT), HttpStatus.OK);
         }
-        // todo 记录文件上传记录
-        //记录文件上传记录
 
+        //记录文件上传记录
         TbUploadFileNew resources = new TbUploadFileNew();
         resources.setUploadTime(DateUtil.date().toTimestamp());
         resources.setUploadFileTaskName(taskName);
         resources.setFileCount((long) files.length);
         resources.setGmtCreate(DateUtil.date().toTimestamp());
-        //操作人 获取当前登录人
         resources.setOperation(SecurityUtils.getCurrentUser().getUsername());
         TbUploadFileNewDto resourcesDto = tbUploadFileNewService.create(resources);
+
         if (ObjectUtil.isEmpty(resourcesDto)) {
-            log.error("保存失败");
+            log.error("上传记录创建失败, resources is {} ", resources.toString());
+            return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.FILE_HANDLE_FAIL), HttpStatus.OK);
         }
+
+        // 解析文件
         int finishTag = 0;
         List<FormdataDto> list = new ArrayList<>();
 
@@ -179,7 +181,7 @@ public class TbUploadFileNewController {
             if (StringUtils.isNotBlank(originalFilename)) {
                 String subOriginalFilename = StringUtils.substringAfterLast(originalFilename, SPLIT_FILE_SYMBOL);
                 if (XLSX_FILE_SUB_NAME.equalsIgnoreCase(subOriginalFilename)) {
-                    // TODO: 2021/8/5 0005 解析 入库
+                    // 解析 入库
                     list = formdataService.parseFileAndSaveToDB(file);
                     if (CollectionUtil.isNotEmpty(list)) {
                         finishTag += 1;