From acfcef2ce8ee34dfa45c9357a77576b568c1589f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=BA=86?= <1576331433@qq.com>
Date: Mon, 11 Jan 2021 20:22:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90file=E3=80=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E5=92=8Csql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/pojo/request/SysFileInfoRequest.java |  5 ++++
 .../response/SysFileInfoListResponse.java     | 21 +++++++++++++
 .../file/modular/entity/SysFileInfo.java      |  9 ++++++
 .../mapper/mapping/SysFileInfoMapper.xml      | 30 +++++++++----------
 4 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java
index 2757bee88..3a0fdea66 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java
@@ -86,6 +86,11 @@ public class SysFileInfoRequest extends BaseRequest {
      */
     private String filePath;
 
+    /**
+     * 文件应用编码
+     */
+    private String fileAppCode;
+
     /**
      * 版本回退
      */
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
index 6c934573c..6276f7f51 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
@@ -20,6 +20,21 @@ public class SysFileInfoListResponse implements Serializable {
      */
     private Long fileId;
 
+    /**
+     * 文件编码
+     * <p>
+     * 解决一个文件多个版本问题，多次上传文件编码不变
+     * <p>
+     * 版本号升级的依据，code相同id不同视为同一个文件的不同版本
+     */
+    private Long fileCode;
+
+
+    /**
+     * 是否为机密文件
+     */
+    private String secretFlag;
+
     /**
      * 文件应用Code名称
      */
@@ -30,6 +45,12 @@ public class SysFileInfoListResponse implements Serializable {
      */
     private String fileOriginName;
 
+
+    /**
+     * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地
+     */
+    private Integer fileLocation;
+
     /**
      * 文件后缀
      */
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java
index fbce6119d..6478c0dbc 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java
@@ -107,4 +107,13 @@ public class SysFileInfo extends BaseEntity {
     @TableField("del_flag")
     private String delFlag;
 
+
+
+    /**
+     * 文件应用Code名称
+     */
+    @TableField(value = "file_app_code")
+    private String fileAppCodeName;
+
+
 }
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
index 43368c120..c7ce9a4d6 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
@@ -28,27 +28,27 @@
     <!--  附件列表  -->
     <select id="fileInfoList" resultType="cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse">
         SELECT file.file_id           AS fileId,
-               file.file_app_code     AS fileAppCode,
-               app.app_name           AS fileAppCodeName,
-               file.file_origin_name  AS fileOriginName,
-               file.file_suffix       AS fileSuffix,
-               file.file_size_info    AS fileSizeInfo,
-               file.file_version      AS fileVersion,
-               file.create_account_id AS createAccountId,
-               file.create_dept_id    AS createDeptId,
-               emp.emp_full_name_cn   AS createUserName,
-               file.create_time       AS createTime,
-               file.del_flag          AS delFlag
+            file.file_code         AS fileCode,
+            file.file_app_code     AS fileAppCode,
+            file.secret_flag       AS secretFlag,
+            app.app_name           AS fileAppCodeName,
+            file.file_location     AS fileLocation,
+            file.file_origin_name  AS fileOriginName,
+            file.file_suffix       AS fileSuffix,
+            file.file_size_info    AS fileSizeInfo,
+            file.file_version      AS fileVersion,
+            user.real_name   AS createUserName,
+            file.create_time       AS createTime,
+            file.del_flag          AS delFlag
         FROM sys_file_info file
-                 LEFT JOIN sys_app app ON file.file_app_code = app.app_code
-                 LEFT JOIN sys_account account ON account.account_id = file.create_account_id
-                 LEFT JOIN hr_emp_main emp ON account.emp_main_id = emp.emp_main_id
+        LEFT JOIN sys_app app ON file.file_app_code = app.app_code
+        LEFT JOIN sys_user user ON user.user_id = file.create_user
         <where>
             <if test="sysFileInfoRequest.fileAppCode != null and sysFileInfoRequest.fileAppCode != '' ">
                 AND file.file_app_code = #{sysFileInfoRequest.fileAppCode}
             </if>
             <if test="sysFileInfoRequest.fileOriginName != null and sysFileInfoRequest.fileOriginName != '' ">
-                AND file.file_app_code LIKE CONCAT('%',#{fileOriginName},'%')
+                AND file.file_origin_name LIKE CONCAT('%',#{sysFileInfoRequest.fileOriginName},'%')
             </if>
         </where>
     </select>

From 0902b7e6813d3f950027942bafbfddbe7dcad043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=BA=86?= <1576331433@qq.com>
Date: Tue, 12 Jan 2021 22:38:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90file=E3=80=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BAfileBucket=E3=80=81fileObje?=
 =?UTF-8?q?ctName=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/pojo/response/SysFileInfoListResponse.java   | 11 +++++++++++
 .../file/modular/mapper/mapping/SysFileInfoMapper.xml |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
index 6276f7f51..fd41ce075 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
@@ -30,6 +30,17 @@ public class SysFileInfoListResponse implements Serializable {
     private Long fileCode;
 
 
+    /**
+     * 文件仓库（文件夹）
+     */
+    private String fileBucket;
+
+
+    /**
+     * 存储到bucket中的名称，主键id+.后缀
+     */
+    private String fileObjectName;
+
     /**
      * 是否为机密文件
      */
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
index c7ce9a4d6..de13bc2e1 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
@@ -27,10 +27,12 @@
 
     <!--  附件列表  -->
     <select id="fileInfoList" resultType="cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse">
-        SELECT file.file_id           AS fileId,
+        SELECT file.file_id        AS fileId,
             file.file_code         AS fileCode,
             file.file_app_code     AS fileAppCode,
             file.secret_flag       AS secretFlag,
+            file.file_bucket       AS fileBucket,
+            file.file_object_name AS fileObjectName,
             app.app_name           AS fileAppCodeName,
             file.file_location     AS fileLocation,
             file.file_origin_name  AS fileOriginName,