From 32024a5ca35283bae1d7fd4e5a510b208291ce9a Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Mon, 3 Jul 2023 14:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 eladmin/README.md                             |  2 +-
 .../main/java/me/zhengjie/base/BaseDTO.java   | 40 -------------------
 .../zhengjie/service/LocalStorageService.java |  4 +-
 .../service/impl/LocalStorageServiceImpl.java | 14 +++----
 5 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java

diff --git a/README.md b/README.md
index 42ee00c..93f39cb 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@
 - eladmin-common 公共模块
     - annotation 为系统自定义注解
     - aspect 自定义注解的切面
-    - base 提供了Entity、DTO基类和mapstruct的通用mapper
+    - base 提供了 Entity 基类
     - config 自定义权限实现、redis配置、swagger配置、Rsa配置等
     - exception 项目统一异常的处理
     - utils 系统通用工具类
diff --git a/eladmin/README.md b/eladmin/README.md
index 0f4ed7a..4824277 100644
--- a/eladmin/README.md
+++ b/eladmin/README.md
@@ -70,7 +70,7 @@
 - eladmin-common 公共模块
     - annotation 为系统自定义注解
     - aspect 自定义注解的切面
-    - base 提供了Entity、DTO基类和mapstruct的通用mapper
+    - base 提供了 Entity 基类
     - config 自定义权限实现、redis配置、swagger配置、Rsa配置等
     - exception 项目统一异常的处理
     - utils 系统通用工具类
diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
deleted file mode 100644
index e9e7cc2..0000000
--- a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package me.zhengjie.base;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
-
-/**
- * @author Zheng Jie
- * @date 2019年10月24日20:48:53
- */
-@Getter
-@Setter
-public class BaseDTO  implements Serializable {
-
-    private String createBy;
-
-    private String updateBy;
-
-    private Timestamp createTime;
-
-    private Timestamp updateTime;
-
-    @Override
-    public String toString() {
-        ToStringBuilder builder = new ToStringBuilder(this);
-        Field[] fields = this.getClass().getDeclaredFields();
-        try {
-            for (Field f : fields) {
-                f.setAccessible(true);
-                builder.append(f.getName(), f.get(this)).append("\n");
-            }
-        } catch (Exception e) {
-            builder.append("toString builder encounter an error");
-        }
-        return builder.toString();
-    }
-}
diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
index 5eb4a70..a9fe552 100644
--- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
+++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
@@ -69,9 +69,9 @@ public interface LocalStorageService extends IService<LocalStorage> {
 
     /**
      * 导出数据
-     * @param localStorageDtos 待导出的数据
+     * @param localStorages 待导出的数据
      * @param response /
      * @throws IOException /
      */
-    void download(List<LocalStorage> localStorageDtos, HttpServletResponse response) throws IOException;
+    void download(List<LocalStorage> localStorages, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file
diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
index a431395..b851582 100644
--- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
+++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
@@ -107,14 +107,14 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
     @Override
     public void download(List<LocalStorage> queryAll, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (LocalStorage localStorageDTO : queryAll) {
+        for (LocalStorage localStorage : queryAll) {
             Map<String,Object> map = new LinkedHashMap<>();
-            map.put("文件名", localStorageDTO.getRealName());
-            map.put("备注名", localStorageDTO.getName());
-            map.put("文件类型", localStorageDTO.getType());
-            map.put("文件大小", localStorageDTO.getSize());
-            map.put("创建者", localStorageDTO.getCreateBy());
-            map.put("创建日期", localStorageDTO.getCreateTime());
+            map.put("文件名", localStorage.getRealName());
+            map.put("备注名", localStorage.getName());
+            map.put("文件类型", localStorage.getType());
+            map.put("文件大小", localStorage.getSize());
+            map.put("创建者", localStorage.getCreateBy());
+            map.put("创建日期", localStorage.getCreateTime());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);