From 4a80dc3753a03f14310ce778b0db106d9583d276 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Wed, 19 Feb 2025 17:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=94=AF=E4=B8=80=E6=80=A7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdFileRelationController.java       |  4 +---
 .../manage/pojo/req/CheckNameUniqueRequest.java    |  5 +++++
 .../manage/service/EdFileRelationService.java      |  5 ++---
 .../serviceimpl/EdFileRelationServiceImpl.java     | 14 ++++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
index 769193f..a7fe027 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
@@ -73,9 +73,7 @@ public class EdFileRelationController {
      */
     @RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
     public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
-        String fileName = checkNameUniqueRequest.getFileName();
-        String parentId = checkNameUniqueRequest.getParentId();
-        return ElectromagneticResultUtil.success(edFileRelationService.checkNameUnique(parentId, fileName));
+        return ElectromagneticResultUtil.success(!edFileRelationService.checkNameUnique(checkNameUniqueRequest));
     }
 
     /**
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/CheckNameUniqueRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/CheckNameUniqueRequest.java
index e20f693..ffe1455 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/CheckNameUniqueRequest.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/CheckNameUniqueRequest.java
@@ -14,4 +14,9 @@ public class CheckNameUniqueRequest {
      * 文件名称
      */
     private String fileName;
+
+    /**
+     * 文件后缀
+     */
+    private String fileType;
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java
index 1de8f98..27a31b7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java
@@ -2,6 +2,7 @@ package com.electromagnetic.industry.software.manage.service;
 
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
+import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
 import com.electromagnetic.industry.software.manage.pojo.resp.FileRelationViewVO;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,11 +35,9 @@ public interface EdFileRelationService {
     /**
      * 检查文件名是否唯一
      *
-     * @param parentId
-     * @param fileName
      * @return
      */
-    Boolean checkNameUnique(String parentId, String fileName);
+    Boolean checkNameUnique(CheckNameUniqueRequest checkNameUniqueRequest);
 
     /**
      * 文件上传并建立关系
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
index 050fdce..985a6f6 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
@@ -18,6 +18,7 @@ import com.electromagnetic.industry.software.manage.mapper.EdFileRelationMapper;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
 import com.electromagnetic.industry.software.manage.pojo.models.Edge;
+import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
 import com.electromagnetic.industry.software.manage.pojo.resp.FileRelationViewVO;
 import com.electromagnetic.industry.software.manage.pojo.resp.FileSimpleInfoVO;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
@@ -130,19 +131,20 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
     /**
      * 检查文件名是否唯一
      *
-     * @param parentId
-     * @param fileName
      * @return
      */
     @Override
     @Transactional
-    public Boolean checkNameUnique(String parentId, String fileName) {
-        String mainName = FileUtil.mainName(fileName);
-        String suffix = FileUtil.getSuffix(fileName);
+    public Boolean checkNameUnique(CheckNameUniqueRequest checkNameUniqueRequest) {
+
+        String mainName = checkNameUniqueRequest.getFileName();
+        String suffix = checkNameUniqueRequest.getFileType();
+        String parentId = checkNameUniqueRequest.getParentId();
+
         EdFileInfo newEdFileInfo = new EdFileInfo();
         newEdFileInfo.newInit();
         // 首先检查是否是同名文件
-        Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), NAME_VALID_MSG);
+        Assert.isTrue(EleCommonUtil.isFileNameValid(mainName + "." +suffix), NAME_VALID_MSG);
         Long count = edFileInfoService.count(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getParentId, parentId)
                 .eq(EdFileInfo::getFileName, mainName)