From c90361d7d97334f025d883a260d0601ad450b784 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 29 Dec 2023 23:10:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=90=8E=E7=AB=AF=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E3=80=81=E5=8D=95=E4=B8=AA=E5=88=A0=E9=99=A4=E3=80=81?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/config/FileRecorderImpl.java | 13 +---
 .../admin/system/model/entity/FileDO.java     | 28 ++++++++
 .../admin/system/model/req/FileReq.java       | 16 ++++-
 .../system/service/impl/FileServiceImpl.java  | 16 +++++
 continew-admin-ui/src/api/system/file.ts      |  6 +-
 .../src/store/modules/app/index.ts            |  6 +-
 continew-admin-ui/src/utils/file.ts           | 13 ----
 .../file/components/FileRenameModal/index.vue | 23 +++----
 .../system/file/main/FileMain/FileImg.vue     |  2 +-
 .../system/file/main/FileMain/FileList.vue    |  4 +-
 .../views/system/file/main/FileMain/index.vue | 69 ++++++++++++++++---
 11 files changed, 138 insertions(+), 58 deletions(-)
 delete mode 100644 continew-admin-ui/src/utils/file.ts

diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/FileRecorderImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/FileRecorderImpl.java
index 493eef71..5ea49e08 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/FileRecorderImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/FileRecorderImpl.java
@@ -76,18 +76,7 @@ public class FileRecorderImpl implements FileRecorder {
         if (null == file) {
             return null;
         }
-        FileInfo fileInfo = new FileInfo();
-        String extension = file.getExtension();
-        fileInfo.setOriginalFilename(
-            StrUtil.isNotBlank(extension) ? file.getName() + StringConstants.DOT + extension : file.getName());
-        fileInfo.setSize(file.getSize());
-        fileInfo.setUrl(file.getUrl());
-        fileInfo.setExt(extension);
-        fileInfo.setBasePath(StringConstants.EMPTY);
-        fileInfo.setPath(StringConstants.EMPTY);
-        fileInfo.setFilename(StrUtil.subAfter(url, StringConstants.SLASH, true));
-        fileInfo.setPlatform(storageMapper.lambdaQuery().eq(StorageDO::getId, file.getStorageId()).one().getCode());
-        return fileInfo;
+        return file.toFileInfo(storageMapper.lambdaQuery().eq(StorageDO::getId, file.getStorageId()).one().getCode());
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java
index dadc1250..6e4fc521 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/FileDO.java
@@ -20,9 +20,15 @@ import java.io.Serial;
 
 import lombok.Data;
 
+import org.dromara.x.file.storage.core.FileInfo;
+
 import com.baomidou.mybatisplus.annotation.*;
 
+import cn.hutool.core.util.StrUtil;
+
 import top.charles7c.continew.admin.system.enums.FileTypeEnum;
+import top.charles7c.continew.starter.core.constant.StringConstants;
+import top.charles7c.continew.starter.core.util.URLUtils;
 import top.charles7c.continew.starter.extension.crud.base.BaseDO;
 
 /**
@@ -70,4 +76,26 @@ public class FileDO extends BaseDO {
      * 存储库 ID
      */
     private Long storageId;
+
+    /**
+     * 转换为 X-File-Storage 文件信息对象
+     *
+     * @param storageCode
+     *            存储库编码
+     * @return X-File-Storage 文件信息对象
+     */
+    public FileInfo toFileInfo(String storageCode) {
+        FileInfo fileInfo = new FileInfo();
+        fileInfo.setOriginalFilename(
+            StrUtil.isNotBlank(this.extension) ? this.name + StringConstants.DOT + this.extension : this.name);
+        fileInfo.setSize(this.size);
+        fileInfo.setUrl(this.url);
+        fileInfo.setExt(this.extension);
+        fileInfo.setBasePath(StringConstants.EMPTY);
+        fileInfo.setPath(StringConstants.EMPTY);
+        fileInfo.setFilename(
+            URLUtils.isHttpUrl(this.url) ? StrUtil.subAfter(this.url, StringConstants.SLASH, true) : this.url);
+        fileInfo.setPlatform(storageCode);
+        return fileInfo;
+    }
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java
index 313ede6a..d8e059e8 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/FileReq.java
@@ -18,22 +18,34 @@ package top.charles7c.continew.admin.system.model.req;
 
 import java.io.Serial;
 
+import jakarta.validation.constraints.NotBlank;
+
 import lombok.Data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import org.hibernate.validator.constraints.Length;
+
 import top.charles7c.continew.starter.extension.crud.base.BaseReq;
 
 /**
- * 创建或修改文件信息
+ * 修改文件信息
  *
  * @author Charles7c
  * @since 2023/12/23 10:38
  */
 @Data
-@Schema(description = "创建或修改文件信息")
+@Schema(description = "修改文件信息")
 public class FileReq extends BaseReq {
 
     @Serial
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 名称
+     */
+    @Schema(description = "名称", example = "test123")
+    @NotBlank(message = "文件名称不能为空")
+    @Length(max = 255, message = "文件名称长度不能超过 {max} 个字符")
+    private String name;
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
index 988ee9b4..5c0416de 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
@@ -17,6 +17,8 @@
 package top.charles7c.continew.admin.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import jakarta.annotation.Resource;
 
@@ -62,6 +64,20 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
     private StorageService storageService;
     private final FileStorageService fileStorageService;
 
+    @Override
+    public void delete(List<Long> ids) {
+        List<FileDO> fileList = baseMapper.lambdaQuery().in(FileDO::getId, ids).list();
+        Map<Long, List<FileDO>> fileListGroup = fileList.stream().collect(Collectors.groupingBy(FileDO::getStorageId));
+        for (Map.Entry<Long, List<FileDO>> entry : fileListGroup.entrySet()) {
+            StorageDetailResp storage = storageService.get(entry.getKey());
+            for (FileDO file : entry.getValue()) {
+                FileInfo fileInfo = file.toFileInfo(storage.getCode());
+                fileStorageService.delete(fileInfo);
+            }
+        }
+        super.delete(ids);
+    }
+
     @Override
     public FileInfo upload(MultipartFile file, String storageCode) {
         StorageDO storage;
diff --git a/continew-admin-ui/src/api/system/file.ts b/continew-admin-ui/src/api/system/file.ts
index 0daf502c..02ed63de 100644
--- a/continew-admin-ui/src/api/system/file.ts
+++ b/continew-admin-ui/src/api/system/file.ts
@@ -47,7 +47,11 @@ export function get(id: string) {
   return axios.get<FileItem>(`${BASE_URL}/${id}`);
 }
 
-export function update(req: FileItem, id: string) {
+export interface FileItemUpdate {
+  name: string;
+}
+
+export function update(req: FileItemUpdate, id: string) {
   return axios.put(`${BASE_URL}/${id}`, req);
 }
 
diff --git a/continew-admin-ui/src/store/modules/app/index.ts b/continew-admin-ui/src/store/modules/app/index.ts
index 4d535253..401dee5e 100644
--- a/continew-admin-ui/src/store/modules/app/index.ts
+++ b/continew-admin-ui/src/store/modules/app/index.ts
@@ -10,7 +10,6 @@ import type { RouteRecordNormalized } from 'vue-router';
 import defaultSettings from '@/config/settings.json';
 import { listRoute } from '@/api/auth';
 import { listOption } from '@/api/common';
-import getFile from '@/utils/file';
 import { AppState, Config } from './types';
 
 const recursionMenu = (
@@ -134,7 +133,7 @@ const useAppStore = defineStore('app', {
           .querySelector('link[rel="shortcut icon"]')
           ?.setAttribute(
             'href',
-            getFile(resMap.get('site_favicon')) ||
+            resMap.get('site_favicon') ||
               'https://cnadmin.charles7c.top/favicon.ico',
           );
       });
@@ -152,8 +151,7 @@ const useAppStore = defineStore('app', {
         .querySelector('link[rel="shortcut icon"]')
         ?.setAttribute(
           'href',
-          getFile(config.site_favicon) ||
-            'https://cnadmin.charles7c.top/favicon.ico',
+          config.site_favicon || 'https://cnadmin.charles7c.top/favicon.ico',
         );
     },
   },
diff --git a/continew-admin-ui/src/utils/file.ts b/continew-admin-ui/src/utils/file.ts
deleted file mode 100644
index 6e94291b..00000000
--- a/continew-admin-ui/src/utils/file.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export default function getFile(file: string | undefined) {
-  if (file) {
-    const baseUrl = import.meta.env.VITE_API_BASE_URL;
-    if (
-      !file.startsWith('http://') &&
-      !file.startsWith('https://') &&
-      !file.startsWith('blob:')
-    ) {
-      return `${baseUrl}/file/${file}`;
-    }
-  }
-  return file;
-}
diff --git a/continew-admin-ui/src/views/system/file/components/FileRenameModal/index.vue b/continew-admin-ui/src/views/system/file/components/FileRenameModal/index.vue
index ae58111c..4d9d60d3 100644
--- a/continew-admin-ui/src/views/system/file/components/FileRenameModal/index.vue
+++ b/continew-admin-ui/src/views/system/file/components/FileRenameModal/index.vue
@@ -20,7 +20,7 @@
           label="文件名称"
           :rules="[{ required: true, message: '请输入文件名称' }]"
         >
-          <a-input v-model="form.name" placeholder="请输入" allow-clear />
+          <a-input v-model="form.name" placeholder="请输入文件名称" allow-clear />
         </a-form-item>
       </a-form>
     </a-row>
@@ -28,16 +28,16 @@
 </template>
 
 <script setup lang="ts">
+  import { getCurrentInstance, onMounted, reactive, ref } from 'vue';
   import type { FormInstance, Modal } from '@arco-design/web-vue';
-  import type { FileItem } from '@/api/system/file';
-  import { onMounted, reactive, ref } from 'vue';
+  import { FileItem, update } from '@/api/system/file';
 
   interface Props {
     fileInfo: FileItem;
     onClose: () => void;
   }
   const props = withDefaults(defineProps<Props>(), {});
-
+  const { proxy } = getCurrentInstance() as any;
   const visible = ref(false);
   type Form = { name: string };
   const form: Form = reactive({
@@ -54,20 +54,15 @@
     props.onClose();
   };
 
-  // 模拟接口
-  const saveApi = (): Promise<boolean> => {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(true);
-      }, 2000);
-    });
-  };
-
   const FormRef = ref<FormInstance | null>(null);
   const save: InstanceType<typeof Modal>['onBeforeOk'] = async () => {
     const flag = await FormRef.value?.validate();
     if (flag) return false;
-    return saveApi();
+    const res = await update({ name: form.name }, props.fileInfo.id);
+    // eslint-disable-next-line vue/no-mutating-props
+    props.fileInfo.name = form.name;
+    proxy.$message.success(res.msg);
+    return true;
   };
 </script>
 
diff --git a/continew-admin-ui/src/views/system/file/main/FileMain/FileImg.vue b/continew-admin-ui/src/views/system/file/main/FileMain/FileImg.vue
index 2e23e09d..5cf5c5e5 100644
--- a/continew-admin-ui/src/views/system/file/main/FileMain/FileImg.vue
+++ b/continew-admin-ui/src/views/system/file/main/FileMain/FileImg.vue
@@ -1,6 +1,6 @@
 <template>
   <img v-if="isImage" class="img" :src="props.data.url || ''" alt="" />
-  <svg-icon v-else size="100%" :icon-class="getFileImg" />
+  <svg-icon v-else :icon-class="getFileImg" style="height: 100%; width: 100%" />
 </template>
 
 <script setup lang="ts">
diff --git a/continew-admin-ui/src/views/system/file/main/FileMain/FileList.vue b/continew-admin-ui/src/views/system/file/main/FileMain/FileList.vue
index cea3ac07..06b46678 100644
--- a/continew-admin-ui/src/views/system/file/main/FileMain/FileList.vue
+++ b/continew-admin-ui/src/views/system/file/main/FileMain/FileList.vue
@@ -37,11 +37,11 @@
         </a-table-column>
         <a-table-column
           title="扩展名"
-          data-index="extendName"
+          data-index="extension"
           :width="100"
         ></a-table-column>
         <a-table-column
-          title="更改时间"
+          title="修改时间"
           data-index="updateTime"
           :width="200"
         ></a-table-column>
diff --git a/continew-admin-ui/src/views/system/file/main/FileMain/index.vue b/continew-admin-ui/src/views/system/file/main/FileMain/index.vue
index 128ceb88..acacb93f 100644
--- a/continew-admin-ui/src/views/system/file/main/FileMain/index.vue
+++ b/continew-admin-ui/src/views/system/file/main/FileMain/index.vue
@@ -5,10 +5,14 @@
       <a-space wrap>
         <a-form ref="queryRef" :model="queryParams" layout="inline">
           <a-form-item hide-label>
-            <a-button type="primary" shape="round">
-              <template #icon><icon-upload /></template>
-              <template #default>上传</template>
-            </a-button>
+            <a-upload :show-file-list="false" :custom-request="handleUpload">
+              <template #upload-button>
+                <a-button type="primary" shape="round">
+                  <template #icon><icon-upload /></template>
+                  <template #default>上传</template>
+                </a-button>
+              </template>
+            </a-upload>
           </a-form-item>
           <a-form-item field="name" hide-label>
             <a-input
@@ -87,12 +91,13 @@
 </template>
 
 <script setup lang="ts">
-  import { Message, Modal } from '@arco-design/web-vue';
+  import { Message, Modal, RequestOption } from '@arco-design/web-vue';
   import { api as viewerApi } from 'v-viewer';
   import { imageTypeList } from '@/constant/file';
   import { useFileStore } from '@/store/modules/file';
   import type { ListParam, FileItem } from '@/api/system/file';
-  import { list } from '@/api/system/file';
+  import { list, del } from '@/api/system/file';
+  import { upload } from '@/api/common';
   import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
   import { getCurrentInstance, onMounted, reactive, ref, toRefs } from 'vue';
   import FileGrid from './FileGrid.vue';
@@ -178,12 +183,17 @@
   };
   // 鼠标右键
   const handleRightMenuClick = (mode: string, fileInfo: FileItem) => {
-    Message.success(`点击了${mode}`);
     if (mode === 'delete') {
       Modal.warning({
         title: '提示',
-        content: '是否删除该文件？',
+        content: `是否确定删除文件 [${fileInfo.name}]？`,
         hideCancel: false,
+        onOk: () => {
+          del(fileInfo.id).then((res) => {
+            proxy.$message.success(res.msg);
+            getList();
+          });
+        },
       });
     }
     if (mode === 'rename') {
@@ -198,11 +208,52 @@
   const handleMulDelete = () => {
     Modal.warning({
       title: '提示',
-      content: '是否确认删除？',
+      content: `是否确定删除所选的${fileStore.selectedFileIds.length}个文件？`,
       hideCancel: false,
+      onOk: () => {
+        del(fileStore.selectedFileIds).then((res) => {
+          proxy.$message.success(res.msg);
+          getList();
+        });
+      },
     });
   };
 
+  /**
+   * 上传
+   *
+   * @param options /
+   */
+  const handleUpload = (options: RequestOption) => {
+    const controller = new AbortController();
+    (async function requestWrap() {
+      const {
+        onProgress,
+        onError,
+        onSuccess,
+        fileItem,
+        name = 'file',
+      } = options;
+      onProgress(20);
+      const formData = new FormData();
+      formData.append(name as string, fileItem.file as Blob);
+      upload(formData)
+        .then((res) => {
+          onSuccess(res);
+          getList();
+          proxy.$message.success(res.msg);
+        })
+        .catch((error) => {
+          onError(error);
+        });
+    })();
+    return {
+      abort() {
+        controller.abort();
+      },
+    };
+  };
+
   /**
    * 查询
    */