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

clean code

This commit is contained in:
chenxudong 2025-04-24 17:37:57 +08:00
parent 71b8297312
commit 3dc82bdea3
22 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EdTagLibraryMapper.java
View File

@ -3,8 +3,6 @@ package com.electromagnetic.industry.software.manage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface EdTagLibraryMapper extends BaseMapper<EdTagLibrary> {

7
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java
View File

@ -1,15 +1,10 @@
package com.electromagnetic.industry.software.manage.pojo.models;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.electromagnetic.industry.software.common.cons.UserConstants;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.enums.PublishEnum;
import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.SignUtils;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data;
@ -17,7 +12,7 @@ import java.util.Date;
@Data
@TableName("ed_tag_library")
public class EdTagLibrary extends BaseModel{
public class EdTagLibrary extends BaseModel {
@TableId
private String tagId; // 主键 ID

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java
View File

@ -1,7 +1,5 @@
package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker;

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java
View File

@ -1,7 +1,6 @@
package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker;

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java
View File

@ -1,7 +1,6 @@
package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker;

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java
View File

@ -8,9 +8,11 @@ import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.SignUtils;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@TableName("ed_users")
@Data
public class User extends BaseModel {

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserBindRoleDTO.java
View File

@ -1,6 +1,5 @@
package com.electromagnetic.industry.software.manage.pojo.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;

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

@ -40,9 +40,10 @@ public interface EdFileRelationService extends IService<EdFileRelation> {
/**
* 逻辑删除文件关系
*
* @param fileId 文件主键id
* @return
*/
boolean logicRemove (String fileId);
boolean logicRemove(String fileId);
}

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

@ -1,12 +1,9 @@
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;
@ -53,5 +50,5 @@ public interface RolePermissionService extends IService<RolePermission> {
* @return
*/
boolean logicRemove (String roleId, String fileId);
boolean logicRemove(String roleId, String fileId);
}

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

@ -2,17 +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);
boolean logicRemove(String userId, String roleId);
}

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

@ -40,7 +40,6 @@ 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;
@ -1507,13 +1506,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
/**
* 统一废除文件相关数据
*
* @param fileId **文件编号，非id
*/
public void cleanRelatedData (String fileId) {
public void cleanRelatedData(String fileId) {
// 查询
LambdaQueryWrapper<EdFileInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EdFileInfo::getFileId, fileId);
List<EdFileInfo> fileInfos =this.list(queryWrapper);
List<EdFileInfo> fileInfos = this.list(queryWrapper);
for (EdFileInfo file : fileInfos) {
String id = file.getId();

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

@ -2,7 +2,6 @@ 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;
@ -181,13 +180,14 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
/**
* 逻辑删除文件关系
*
* @param fileId 文件主键id
* @return
*/
@Override
public boolean logicRemove (String fileId) {
public boolean logicRemove(String fileId) {
Assert.notNull(fileId, "参数不能为空");
return this.update( new LambdaUpdateWrapper<EdFileRelation>()
return this.update(new LambdaUpdateWrapper<EdFileRelation>()
.set(EdFileRelation::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
.and(wrapper -> wrapper
.eq(EdFileRelation::getId1, fileId)

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -29,7 +29,6 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;

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

@ -14,9 +14,7 @@ import com.electromagnetic.industry.software.common.exception.BizException;
import com.electromagnetic.industry.software.common.pojo.TreeNode;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.mapper.EdTagLibraryMapper;
import com.electromagnetic.industry.software.manage.mapper.FileTagRelationMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary;
import com.electromagnetic.industry.software.manage.pojo.models.FileTagRelation;
import com.electromagnetic.industry.software.manage.pojo.resp.FileTagInfo;
import com.electromagnetic.industry.software.manage.pojo.resp.TagListVO;
import com.electromagnetic.industry.software.manage.service.EdTagLibraryService;

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
View File

@ -28,7 +28,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j

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

@ -3,11 +3,9 @@ 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;
import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
import com.electromagnetic.industry.software.manage.mapper.EdTagLibraryMapper;

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

@ -9,7 +9,6 @@ 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;
@ -168,7 +167,7 @@ public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper,
@Transactional
@Override
public boolean logicRemove (String roleId, String fileId) {
public boolean logicRemove(String roleId, String fileId) {
// 参数校验
if (roleId == null && fileId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");

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

@ -17,7 +17,6 @@ import com.electromagnetic.industry.software.manage.mapper.RoleMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.models.Role;
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.RoleDTO;
import com.electromagnetic.industry.software.manage.pojo.req.RolePageDTO;
import com.electromagnetic.industry.software.manage.pojo.req.RolePermissionDTO;
@ -125,7 +124,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
LambdaUpdateWrapper<Role> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Role::getId, roleId)
.set(Role::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code);
boolean isUpdated =this.update(updateWrapper);
boolean isUpdated = this.update(updateWrapper);
if (isUpdated) {
// 失效角色权限关联表

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

@ -15,6 +15,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
/**
* 逻辑删除用户-角色关联关系
*
* @param userId 用户ID（可选）
* @param roleId 角色ID（可选）
* @return 操作是否成功
@ -22,7 +23,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
*/
@Transactional
@Override
public boolean logicRemove (String userId, String roleId) {
public boolean logicRemove(String userId, String roleId) {
// 参数校验
if (userId == null && roleId == null) {
throw new IllegalArgumentException("必须提供至少一个参数");

7
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FileRepeatEnum.java
View File

@ -13,16 +13,17 @@ public enum FileRepeatEnum {
REVERSION(2, "所有冲突文件版本更新"),
NEW(3, "重命名所有冲突文件, 文件后加“_1”");
public final int code;
public final String desc;
private static final Map<Integer, FileRepeatEnum> MAP = new HashMap<>();
static {
for (FileRepeatEnum e : FileRepeatEnum.values()) {
MAP.put(e.code, e);
}
}
public final int code;
public final String desc;
public static String getDesc(int code) {
return Optional.ofNullable(MAP.get(code)).map(e -> e.desc).orElse("");
}