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

代码优化

This commit is contained in:
s2042968 2025-04-24 13:53:48 +08:00
parent fe656f9beb
commit 43001fca86
13 changed files with 192 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileRelationService.java
View File

@ -38,4 +38,11 @@ public interface EdFileRelationService extends IService<EdFileRelation> {
*/
Boolean checkNameExist(CheckNameUniqueRequest checkNameUniqueRequest);
/**
* 逻辑删除文件关系
* @param fileId 文件主键id
* @return
*/
boolean logicRemove (String fileId);
}

9
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/FileTagRelationService.java
View File

@ -34,4 +34,13 @@ public interface FileTagRelationService extends IService<FileTagRelation> {
*/
List<String> getFileIdsByTagIds(List<String> tagIds);
/**
* 逻辑删除文件标签关系
*
* @param fileId
* @param tagId
* @return
*/
boolean logicRemove(String fileId, String tagId);
}

13
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/RolePermissionService.java
View File

@ -1,9 +1,12 @@
package com.electromagnetic.industry.software.manage.service;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.models.RolePermission;
import com.electromagnetic.industry.software.manage.pojo.req.PublishedFileDTO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -41,4 +44,14 @@ public interface RolePermissionService extends IService<RolePermission> {
* @param prjId
*/
void syncPermissionsAfterTreeUpdate(List<EdFileInfo> files, String prjId);
/**
* 逻辑删除
*
* @param roleId
* @param fileId
* @return
*/
boolean logicRemove (String roleId, String fileId);
}

11
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserRoleService.java
View File

@ -2,6 +2,17 @@ package com.electromagnetic.industry.software.manage.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
import org.springframework.transaction.annotation.Transactional;
public interface UserRoleService extends IService<UserRole> {
/**
* 逻辑删除用户-角色关联关系
* @param userId 用户ID（可选）
* @param roleId 角色ID（可选）
* @return 操作是否成功
* @throws IllegalArgumentException 参数校验失败时抛出
*/
boolean logicRemove (String userId, String roleId);
}

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

@ -20,10 +20,14 @@ public class EdFileFavoriteServiceImpl extends ServiceImpl<EdFileFavoriteMapper,
* @return
*/
public boolean logicRemove(String userId, String fileId) {
if (userId == null && fileId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");
}
LambdaUpdateWrapper<EdFileFavorite> updateWrapper = Wrappers.lambdaUpdate(EdFileFavorite.class)
.eq(EdFileFavorite::getUserId, userId)
.eq(EdFileFavorite::getFileId, fileId)
.set(EdFileFavorite::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code);
.set(EdFileFavorite::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.eq(userId != null, EdFileFavorite::getUserId, userId)
.eq(fileId != null, EdFileFavorite::getFileId, fileId)
.eq(EdFileFavorite::getEffectFlag, EffectFlagEnum.EFFECT.code);
return update(updateWrapper);
}

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

@ -40,6 +40,7 @@ import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO;
import com.electromagnetic.industry.software.manage.service.*;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
@ -83,6 +84,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
private UserAccessLogService userAccessLogService;
@Resource
private EdFileRelationService edFileRelationService;
@Resource
private RolePermissionService rolePermissionService;
/**
* 查询文件列表
@ -256,6 +259,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.set(EdFileInfo::getEffectFlag, false)
.set(EdFileInfo::getAllDeleted, true)
.eq(EdFileInfo::getFileId, fileInfo.getFileId()));
// 统一处理文件相关关系
cleanRelatedData(fileInfo.getFileId());
UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废文件 {}.{} 成功，路径为 {}", fileInfo.getFileName(), fileInfo.getFileType(), dbPath);
return ElectromagneticResultUtil.success(true);
}
@ -1498,4 +1503,27 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
UserThreadLocal.setSuccessInfo("", id, StrFormatter.format("建立了文件 {} 与文件 {} 的关系", id, relatedFileId));
return ElectromagneticResultUtil.success(true);
}
/**
* 统一废除文件相关数据
* @param fileId **文件编号，非id
*/
public void cleanRelatedData (String fileId) {
// 查询
LambdaQueryWrapper<EdFileInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EdFileInfo::getFileId, fileId);
List<EdFileInfo> fileInfos =this.list(queryWrapper);
for (EdFileInfo file : fileInfos) {
String id = file.getId();
// 逻辑删除 文件收藏关系
fileFavoriteService.logicRemove(null, id);
// 逻辑删除 文件权限关系
rolePermissionService.logicRemove(null, id);
// 逻辑删除 文件关联关系
edFileRelationService.logicRemove(id);
}
// 逻辑删除 文件标签关系
fileTagRelationService.logicRemove(fileId, null);
}
}

19
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
View File

@ -2,7 +2,9 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.text.StrFormatter;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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;
@ -177,6 +179,23 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
return count > 0;
}
/**
* 逻辑删除文件关系
* @param fileId 文件主键id
* @return
*/
@Override
public boolean logicRemove (String fileId) {
Assert.notNull(fileId, "参数不能为空");
return this.update( new LambdaUpdateWrapper<EdFileRelation>()
.set(EdFileRelation::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.and(wrapper -> wrapper
.eq(EdFileRelation::getId1, fileId)
.or()
.eq(EdFileRelation::getId2, fileId))
.eq(EdFileRelation::getEffectFlag, EffectFlagEnum.EFFECT.code));
}
private List<Edge> getEdges(String id) {
LambdaQueryWrapper<EdFileRelation> queryWrapper = new LambdaQueryWrapper<>();

18
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
View File

@ -33,7 +33,8 @@ import java.util.stream.Collectors;
public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdTagLibrary> implements EdTagLibraryService {
@Resource
FileTagRelationMapper fileTagRelationMapper;
FileTagRelationService fileTagRelationService;
/**
* 新建标签组
@ -208,11 +209,9 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
.eq(EdTagLibrary::getParentId, tagId));
// 逻辑删除子标签的关联关系
if (!tags.isEmpty()) {
fileTagRelationMapper.update(
Wrappers.lambdaUpdate(FileTagRelation.class)
.set(FileTagRelation::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.in(FileTagRelation::getTagId, tags.stream().map(EdTagLibrary::getTagId).collect(Collectors.toList()))
);
for (EdTagLibrary childTag : tags) {
fileTagRelationService.logicRemove(null, childTag.getTagId());
}
}
}
@ -223,11 +222,8 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
.eq(EdTagLibrary::getTagId, tagId)
);
// 逻辑删除本身的关联关系
fileTagRelationMapper.update(
Wrappers.lambdaUpdate(FileTagRelation.class)
.set(FileTagRelation::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.eq(FileTagRelation::getTagId, tagId)
);
fileTagRelationService.logicRemove(null, tagId);
if (mainDeleted) {
UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("删除了标签 {} ", tag.getTagName()));
}

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

@ -142,4 +142,24 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
.toList();
}
/**
* 逻辑删除文件标签关系
*
* @param fileId
* @param tagId
* @return
*/
@Override
public boolean logicRemove(String fileId, String tagId) {
if (fileId == null && tagId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");
}
return this.update(
new LambdaUpdateWrapper<FileTagRelation>()
.set(FileTagRelation::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.eq(fileId != null, FileTagRelation::getFileId, fileId)
.eq(tagId != null, FileTagRelation::getTagId, tagId)
.eq(FileTagRelation::getEffectFlag, EffectFlagEnum.EFFECT.code)
);
}
}

26
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.manage.mapper.RolePermissionMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.models.RolePermission;
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
import com.electromagnetic.industry.software.manage.pojo.req.PublishedFileDTO;
import com.electromagnetic.industry.software.manage.service.RolePermissionService;
import jakarta.annotation.Resource;
@ -156,4 +157,29 @@ public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper,
.collect(Collectors.toSet());
return !parentIdSet.contains(id);
}
/**
* 逻辑删除
*
* @param roleId
* @param fileId
* @return
*/
@Transactional
@Override
public boolean logicRemove (String roleId, String fileId) {
// 参数校验
if (roleId == null && fileId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");
}
// 执行逻辑删除
return this.update(
new LambdaUpdateWrapper<RolePermission>()
.set(RolePermission::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.eq(fileId != null, RolePermission::getFileId, fileId)
.eq(roleId != null, RolePermission::getRoleId, roleId)
.eq(RolePermission::getEffectFlag, EffectFlagEnum.EFFECT.code)
);
}
}

39
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
View File

@ -100,10 +100,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
.set(Role::getRoleName, roleDTO.getRoleName())
.set(Role::getRoleDesc, roleDTO.getRoleDesc());
this.update(updateWrapper);
// 失效角色关联的旧权限
disableRolePermission(roleDTO.getRoleId());
rolePermissionService.logicRemove(roleDTO.getRoleId(), null);
// 插入/激活新权限信息
List<RolePermissionDTO> data = roleDTO.getData();
List<RolePermission> list = flattenTree(data, roleDTO.getRoleId());
@ -123,17 +121,18 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override
public Boolean deleteRole(String roleId) {
// 失效角色权限关联表
disableRolePermission(roleId);
// 失效用户角色关联表
disableUserRole(roleId);
// 失效角色
LambdaUpdateWrapper<Role> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Role::getId, roleId)
.set(Role::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code);
this.update(updateWrapper);
boolean isUpdated =this.update(updateWrapper);
if (isUpdated) {
// 失效角色权限关联表
rolePermissionService.logicRemove(roleId, null);
// 失效用户角色关联表
userRoleService.logicRemove(null, roleId);
}
UserThreadLocal.setSuccessInfo("", roleId, "删除了角色");
return true;
@ -393,25 +392,5 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
return infos;
}
/**
* 失效角色权限关系
*/
private void disableRolePermission(String roleId) {
// 失效旧权限信息
LambdaQueryWrapper<RolePermission> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RolePermission::getRoleId, roleId);
List<RolePermission> oldPermissions = rolePermissionService.list(queryWrapper);
rolePermissionService.disableOldPermissions(oldPermissions);
}
/**
* 失效角色用户关系
*/
private void disableUserRole(String roleId) {
LambdaUpdateWrapper<UserRole> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(UserRole::getRoleId, roleId)
.set(UserRole::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code);
userRoleService.update(updateWrapper);
}
}

29
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserRoleServiceImpl.java
View File

@ -1,11 +1,40 @@
package com.electromagnetic.industry.software.manage.service.serviceimpl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.manage.mapper.UserRoleMapper;
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
import com.electromagnetic.industry.software.manage.service.UserRoleService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
/**
* 逻辑删除用户-角色关联关系
* @param userId 用户ID（可选）
* @param roleId 角色ID（可选）
* @return 操作是否成功
* @throws IllegalArgumentException 参数校验失败时抛出
*/
@Transactional
@Override
public boolean logicRemove (String userId, String roleId) {
// 参数校验
if (userId == null && roleId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");
}
// 执行逻辑删除
return this.update(
new LambdaUpdateWrapper<UserRole>()
.set(UserRole::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.eq(userId != null, UserRole::getUserId, userId)
.eq(roleId != null, UserRole::getRoleId, roleId)
.eq(UserRole::getEffectFlag, EffectFlagEnum.EFFECT.code)
);
}
}

11
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
View File

@ -33,6 +33,7 @@ import com.electromagnetic.industry.software.manage.pojo.other.SingleUserRespons
import com.electromagnetic.industry.software.manage.pojo.req.*;
import com.electromagnetic.industry.software.manage.pojo.resp.UserLoginResponse;
import com.electromagnetic.industry.software.manage.pojo.resp.UserSearchResponse;
import com.electromagnetic.industry.software.manage.service.EdFileFavoriteService;
import com.electromagnetic.industry.software.manage.service.UserRoleService;
import com.electromagnetic.industry.software.manage.service.UserService;
import io.jsonwebtoken.Jwts;
@ -58,6 +59,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
private UserRoleService userRoleService;
@Resource
private RoleMapper roleMapper;
@Resource
private EdFileFavoriteService edFileFavoriteService;
/**
* 用户登录
@ -272,11 +275,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
.eq(User::getId, userId)
.set(User::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
// 2. 级联失效用户角色关系
if (success) {
userRoleService.update(new LambdaUpdateWrapper<UserRole>()
.eq(UserRole::getUserId, userId)
.set(UserRole::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
// 级联失效用户角色关系
userRoleService.logicRemove(userId, null);
// 级联失效用户文件收藏关系
edFileFavoriteService.logicRemove(userId, null);
}
UserThreadLocal.setSuccessInfo("", "", StrFormatter.format("删除了用户 {} ", user.getUserName()));