From 4faab3d89b4cd55e26bf554eae15365725876a6b Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Fri, 14 Feb 2025 09:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java     | 10 +++++++++-
 .../src/main/resources/application.properties          |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 05e6c08..27359f8 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -26,6 +26,7 @@ import com.electromagnetic.industry.software.common.util.*;
 import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
 import com.electromagnetic.industry.software.manage.mapper.UserMapper;
 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.User;
 import com.electromagnetic.industry.software.manage.pojo.other.FileInfoVO;
 import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO;
@@ -71,7 +72,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     private PermissionService permissionService;
     @Resource
     private UserMapper userMapper;
-
+    @Resource
+    private EdFileRelationServiceImpl edFileRelationService;
 
     private String downloadDataDir = "";
     private String uploadDataDir = "";
@@ -211,6 +213,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .set(EdFileInfo::getEffectFlag, false)
                 .set(EdFileInfo::getAllDeleted, true)
                 .eq(EdFileInfo::getFileId, fileInfo.getFileId()));
+
+        // 删除文件时，同时删除其关联关系
+        edFileRelationService.remove(Wrappers.lambdaQuery(EdFileRelation.class)
+                .eq(EdFileRelation::getId1, id)
+                .or()
+                .eq(EdFileRelation::getId2, id));
         return ElectromagneticResultUtil.success(true);
     }
 
diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties
index b63fb91..5fd632c 100644
--- a/electrmangnetic/src/main/resources/application.properties
+++ b/electrmangnetic/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 #required
 spring.application.name=electromagnetic-data
 spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-spring.datasource.username=comac
-spring.datasource.password=2024*Comac
+spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_user_test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.username=em_user_test
+spring.datasource.password=Szsd#2O25$test
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 mybatis-plus.mapper-locations=classpath:sqlmapper/*.xml
@@ -14,7 +14,7 @@ pagehelper.helperDialect=mysql
 pagehelper.reasonable=false
 server.port=12395
 file.security.passwd=adknfhkj87654knd
-#windows文件存储目录，用于测试
+#windows文件存储目录，用于测试
 data.windows.path=D:/tmp/eleData/project/
 data.linux.path=/szsd/data/eleData/project/
 data.upload.windows.tmp.path=D:/tmp/eleData/upload/