From d2219886a01881a348633f3ba6d6790ca6e3b357 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 13 May 2025 16:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5=E9=81=87?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/SysEdFileInfoController.java     |  4 ++--
 .../service/serviceimpl/EdFileInfoServiceImpl.java     | 10 +++++-----
 .../serviceimpl/FileTagRelationServiceImpl.java        |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java
index fd9fda8..9233f6d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java
@@ -203,12 +203,12 @@ public class SysEdFileInfoController {
     }
 
     /**
-     * 从收藏夹移除
+     * 导入本地工程
      *
      * @param
      * @return
      */
-    @GetMapping("/importPrj")
+    @RequestMapping("/importPrj")
     @UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
     public ElectromagneticResult<?> importPrj(@RequestParam("file") MultipartFile file, @RequestParam(name = "templateCode", defaultValue = "bhdcfzrjzt", required = false) String templateCode) {
         return edFileInfoService.importPrj(file, templateCode);
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 b3212ae..f63bab0 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
@@ -510,11 +510,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(EdFileRelation::getId1, importRelation.getId())
                     .eq(EdFileRelation::getId2, importRelation.getId2()));
             if (Objects.isNull(dbRelation)) {
-                edFileRelationService.save(importRelation);
+                edFileRelationService.saveOrUpdate(importRelation);
             } else {
                 // 如果导入的比线上的新，则新增
                 if (importRelation.getUpdatedTime().after(dbRelation.getUpdatedTime())) {
-                    edFileRelationService.save(importRelation);
+                    edFileRelationService.saveOrUpdate(importRelation);
                 }
             }
         }
@@ -529,7 +529,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(FileTagRelation::getTagId, importRelation.getId())
                     .eq(FileTagRelation::getFileId, importRelation.getFileId()));
             if (Objects.isNull(dbRelation)) {
-                fileTagRelationService.save(importRelation);
+                fileTagRelationService.saveOrUpdate(importRelation);
             } else {
                 if (!Objects.equals(importRelation.getEffectFlag(), dbRelation.getEffectFlag())) {
                     dbRelation.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code);
@@ -549,7 +549,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(EdFileFavorite::getCreatedBy, userId)
                     .eq(EdFileFavorite::getFileId, importFileFavorite.getFileId()));
             if (Objects.isNull(dbFileFavorite)) {
-                fileFavoriteService.save(importFileFavorite);
+                fileFavoriteService.saveOrUpdate(importFileFavorite);
             } else {
                 if (importFileFavorite.getUpdatedTime().after(dbFileFavorite.getUpdatedTime())) {
                     dbFileFavorite.setEffectFlag(importFileFavorite.getEffectFlag());
@@ -1565,7 +1565,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 rolePermission.setRoleId(role.getId());
                 rolePermission.setFileId(id);
                 rolePermission.setPermissionCode(permission.getCode());
-                rolePermissionService.save(rolePermission);
+                rolePermissionService.saveOrUpdate(rolePermission);
             }
         }
     }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
index 0e591c7..a2d7bd1 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
@@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
 import com.electromagnetic.industry.software.common.enums.PublishEnum;
@@ -82,6 +83,7 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
         for (String tagId : tagIds) {
             isSuccess &= addTagToFile(fileId, tagId, createdBy);
         }
+        edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).eq(EdFileInfo::getId, fileId).set(EdFileInfo::getPermanentDeleted, false));
         if (isSuccess) {
 
             String tags = edTagLibraryMapper.selectList(new LambdaQueryWrapper<EdTagLibrary>()