chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决导入遇到的问题

This commit is contained in:
chenxudong 2025-05-13 16:21:53 +08:00
parent 309dad6895
commit d2219886a0
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java
View File

@ -203,12 +203,12 @@ public class SysEdFileInfoController {
} }
/** /**
* 从收藏夹移除 * 导入本地工程
* *
* @param * @param
* @return * @return
*/ */
@GetMapping("/importPrj") @RequestMapping("/importPrj")
@UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE) @UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> importPrj(@RequestParam("file") MultipartFile file, @RequestParam(name = "templateCode", defaultValue = "bhdcfzrjzt", required = false) String templateCode) { public ElectromagneticResult<?> importPrj(@RequestParam("file") MultipartFile file, @RequestParam(name = "templateCode", defaultValue = "bhdcfzrjzt", required = false) String templateCode) {
return edFileInfoService.importPrj(file, templateCode); return edFileInfoService.importPrj(file, templateCode);

10
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -510,11 +510,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileRelation::getId1, importRelation.getId()) .eq(EdFileRelation::getId1, importRelation.getId())
.eq(EdFileRelation::getId2, importRelation.getId2())); .eq(EdFileRelation::getId2, importRelation.getId2()));
if (Objects.isNull(dbRelation)) { if (Objects.isNull(dbRelation)) {
edFileRelationService.save(importRelation); edFileRelationService.saveOrUpdate(importRelation);
} else { } else {
// 如果导入的比线上的新，则新增 // 如果导入的比线上的新，则新增
if (importRelation.getUpdatedTime().after(dbRelation.getUpdatedTime())) { 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::getTagId, importRelation.getId())
.eq(FileTagRelation::getFileId, importRelation.getFileId())); .eq(FileTagRelation::getFileId, importRelation.getFileId()));
if (Objects.isNull(dbRelation)) { if (Objects.isNull(dbRelation)) {
fileTagRelationService.save(importRelation); fileTagRelationService.saveOrUpdate(importRelation);
} else { } else {
if (!Objects.equals(importRelation.getEffectFlag(), dbRelation.getEffectFlag())) { if (!Objects.equals(importRelation.getEffectFlag(), dbRelation.getEffectFlag())) {
dbRelation.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code); dbRelation.setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code);
@ -549,7 +549,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileFavorite::getCreatedBy, userId) .eq(EdFileFavorite::getCreatedBy, userId)
.eq(EdFileFavorite::getFileId, importFileFavorite.getFileId())); .eq(EdFileFavorite::getFileId, importFileFavorite.getFileId()));
if (Objects.isNull(dbFileFavorite)) { if (Objects.isNull(dbFileFavorite)) {
fileFavoriteService.save(importFileFavorite); fileFavoriteService.saveOrUpdate(importFileFavorite);
} else { } else {
if (importFileFavorite.getUpdatedTime().after(dbFileFavorite.getUpdatedTime())) { if (importFileFavorite.getUpdatedTime().after(dbFileFavorite.getUpdatedTime())) {
dbFileFavorite.setEffectFlag(importFileFavorite.getEffectFlag()); dbFileFavorite.setEffectFlag(importFileFavorite.getEffectFlag());
@ -1565,7 +1565,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
rolePermission.setRoleId(role.getId()); rolePermission.setRoleId(role.getId());
rolePermission.setFileId(id); rolePermission.setFileId(id);
rolePermission.setPermissionCode(permission.getCode()); rolePermission.setPermissionCode(permission.getCode());
rolePermissionService.save(rolePermission); rolePermissionService.saveOrUpdate(rolePermission);
} }
} }
} }

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.enums.PublishEnum; import com.electromagnetic.industry.software.common.enums.PublishEnum;
@ -82,6 +83,7 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
for (String tagId : tagIds) { for (String tagId : tagIds) {
isSuccess &= addTagToFile(fileId, tagId, createdBy); isSuccess &= addTagToFile(fileId, tagId, createdBy);
} }
edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).eq(EdFileInfo::getId, fileId).set(EdFileInfo::getPermanentDeleted, false));
if (isSuccess) { if (isSuccess) {
String tags = edTagLibraryMapper.selectList(new LambdaQueryWrapper<EdTagLibrary>() String tags = edTagLibraryMapper.selectList(new LambdaQueryWrapper<EdTagLibrary>()