diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java index 9532f58..c21d7cd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java @@ -8,5 +8,4 @@ import org.springframework.web.bind.annotation.RestController; public class EdFileInfoController { - } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/PermissionController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/PermissionController.java index b2d6eb1..fe198a3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/PermissionController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/PermissionController.java @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; @RestController @RequestMapping("/data/ed/permission") @@ -20,8 +19,8 @@ public class PermissionController { @Resource private PermissionService permissionService; - @ApiOperation(value="查询当前用户在当前目录的功能权限",notes = "") - @GetMapping(value="/{fileId}") + @ApiOperation(value = "查询当前用户在当前目录的功能权限", notes = "") + @GetMapping(value = "/{fileId}") public ElectromagneticResult getUserPermission(@PathVariable("fileId") String fileId) { String userId = UserThreadLocal.getUserId(); return ElectromagneticResultUtil.success(permissionService.getUserPermission(userId, fileId)); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java index e30924a..04a167f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RoleController.java @@ -1,6 +1,7 @@ package com.electromagnetic.industry.software.manage.controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/data/ed/role") diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java index a7bc132..018a63f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java @@ -70,13 +70,13 @@ public class UserController { return userService.logout(token); } - @ApiOperation(value="人员绑定", notes = "") + @ApiOperation(value = "人员绑定", notes = "") @RequestMapping(value = "/bindRoles", method = RequestMethod.POST) public ElectromagneticResult bindRoles(@RequestBody UserRoleRequest userRoleRequest) { if (userService.bindRoles(userRoleRequest)) { return ElectromagneticResultUtil.success(true); } else { - return ElectromagneticResultUtil.fail("500","不可绑定空用户"); + return ElectromagneticResultUtil.fail("500", "不可绑定空用户"); } } } \ No newline at end of file diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java index fad9251..5b65cac 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java @@ -2,7 +2,8 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import lombok.experimental.FieldNameConstants; @@ -98,7 +99,7 @@ public class EdFileInfo extends BaseModel { private Integer effectFlag; /** - *保存状态,0-上传中 1-上传成功 2-上传失败 + * 保存状态,0-上传中 1-上传成功 2-上传失败 */ @TableField(value = "save_status") private Integer saveStatus; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java index fcf3c88..6f5f4a6 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java @@ -1,7 +1,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.time.LocalDateTime; @Data @@ -71,7 +74,7 @@ public class Role { /** * 是否有效:0-无效 1-有效 */ - @TableField(value="effect_flag") + @TableField(value = "effect_flag") private Integer effectFlag; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java index 1f128bf..a5e9ef6 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java @@ -11,7 +11,7 @@ public class RolePermission { /** * 角色编码 */ - @TableField(value="role_id") + @TableField(value = "role_id") private String roleId; /** diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java index d6a28ea..0ad0944 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java @@ -17,6 +17,6 @@ public class UserRole { /** * 角色编码 */ - @TableField(value="role_id") + @TableField(value = "role_id") private String roleId; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java index 8d7034c..af550e3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java @@ -9,12 +9,14 @@ public interface EdFileInfoService { /** * 创建一个新的工程 + * * @param prjName 新的工程名 */ ElectromagneticResult createNewPrj(String prjName); /** * 修改项目名称 + * * @param prjId * @param newPrjName * @return @@ -23,6 +25,7 @@ public interface EdFileInfoService { /** * 删除一个项目,做逻辑删除 + * * @param prjId * @return */ @@ -30,6 +33,7 @@ public interface EdFileInfoService { /** * 添加子集 + * * @param parentId * @param folderName * @return @@ -38,12 +42,14 @@ public interface EdFileInfoService { /** * 查询所有项目 + * * @return */ ElectromagneticResult queryAllPrjInfo(); /** * 子集拖拽重排序 + * * @param folderResortDTOList * @return */ @@ -51,6 +57,7 @@ public interface EdFileInfoService { /** * 项目发布 + * * @param prjId * @return */ @@ -58,6 +65,7 @@ public interface EdFileInfoService { /** * 删除子集 + * * @param fileId * @return */ @@ -65,6 +73,7 @@ public interface EdFileInfoService { /** * 层级沿用 + * * @param sourceId * @param targetId * @return @@ -73,6 +82,7 @@ public interface EdFileInfoService { /** * 修改子集名称 + * * @param id * @param newFolderName * @return diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/PermissionService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/PermissionService.java index bd4c806..4133f4a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/PermissionService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/PermissionService.java @@ -7,11 +7,12 @@ public interface PermissionService { /** * 查询当前用户在当前目录的功能权限 + * * @param userId * @param fileId * @return */ - Map getUserPermission(String userId, String fileId); + Map getUserPermission(String userId, String fileId); /** * 获取当前用户有权限访问的目录id diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java index f472147..8bc5f51 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java @@ -32,7 +32,6 @@ import com.electromagnetic.industry.software.manage.service.EDDataService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; import org.springframework.http.HttpHeaders; @@ -63,25 +62,25 @@ public class EDDataServiceImpl implements EDDataService { private EDDataMapper edDataMapper; @Resource private CategoryMapper categoryMapper; -// @Value("${data.windows.path}") + // @Value("${data.windows.path}") private String uploadFilePath; -// @Value("${data.file.storage.dir}") + // @Value("${data.file.storage.dir}") private String fileStorageDir; -// @Value("${data.import.cache.dir}") + // @Value("${data.import.cache.dir}") private String importCacheDir; -// @Value("${file.encode.passwd}") + // @Value("${file.encode.passwd}") private String encodePasswd; -// @Value("${data.type.folder}") + // @Value("${data.type.folder}") private String dataTypeFolder; -// @Value("${data.windows.path}") + // @Value("${data.windows.path}") private String windowsDir; -// @Value("${data.file.cache.dir}") + // @Value("${data.file.cache.dir}") private String fileCacheDir; -// @Value("${data.upload.cache.dir}") + // @Value("${data.upload.cache.dir}") private String uploadCacheDir; -// @Value("${data.export.cache.dir}") + // @Value("${data.export.cache.dir}") private String exportCacheDir; -// @Value("${data.type.file}") + // @Value("${data.type.file}") private String dataTypeFile; @Override 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 8b75c9b..7fc21f0 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 @@ -18,7 +18,10 @@ import com.electromagnetic.industry.software.common.enums.EleDataStatusEnum; import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum; import com.electromagnetic.industry.software.common.exception.BizException; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; -import com.electromagnetic.industry.software.common.util.*; +import com.electromagnetic.industry.software.common.util.EleCommonUtil; +import com.electromagnetic.industry.software.common.util.EleLog; +import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; +import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper; import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO; @@ -39,15 +42,13 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; +import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.MYSQL_FILE_PATH_SPLIT; @Service public class EdFileInfoServiceImpl extends ServiceImpl implements EdFileInfoService { - private final EleLog log = new EleLog(EdFileInfoServiceImpl.class); - private static final String PRJ_PARENT_ID = "0"; - + private final EleLog log = new EleLog(EdFileInfoServiceImpl.class); @Resource private Environment environment; @@ -68,6 +69,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl targetTmpEdFiles = targetEdFileInfos.stream() .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count) .collect(Collectors.toList()); - Map sourceFileNameMap= sourceTmpEdFiles.stream().collect(Collectors.toMap(EdFileInfo::getFileName, e -> e)); + Map sourceFileNameMap = sourceTmpEdFiles.stream().collect(Collectors.toMap(EdFileInfo::getFileName, e -> e)); List targetFileNames = targetTmpEdFiles.stream().map(EdFileInfo::getFileName).collect(Collectors.toList()); for (EdFileInfo edFileInfo : sourceTmpEdFiles) { String sourceFileName = edFileInfo.getFileName(); @@ -493,7 +496,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl getUserPermission (String userId, String fileId){ - Map result = new HashMap<>(); + public Map getUserPermission(String userId, String fileId) { + Map result = new HashMap<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("role_id").eq("user_id", userId); @@ -70,8 +70,8 @@ public class PermissionServiceImpl implements PermissionService { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.select("file_id") - .in("role_id",roleIds) - .eq("permission_code",FilePermission.VIEW); + .in("role_id", roleIds) + .eq("permission_code", FilePermission.VIEW); List fileIds = rolePermissionMapper.selectObjs(queryWrapper1); return fileIds.stream() diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index d77ae5e..609d055 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -249,7 +249,7 @@ public class UserServiceImpl implements UserService { public Boolean bindRoles(UserRoleRequest userRolesRequest) { String userId = userRolesRequest.getUserId(); List roleIds = userRolesRequest.getRoleIds(); - if (userId == null ) { + if (userId == null) { return Boolean.FALSE; } // 删除当前用户原绑定角色 diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml index 8a06d34..775424b 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml @@ -4,12 +4,19 @@ \ No newline at end of file diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java index f59a3f4..a6bc964 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EffectFlagEnum.java @@ -1,7 +1,6 @@ package com.electromagnetic.industry.software.common.enums; import lombok.AllArgsConstructor; -import lombok.Getter; /** * 是否删除枚举 diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java index 238f8fd..ac132ea 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java @@ -14,7 +14,7 @@ public enum FilePermission { DOWNLOAD("download", "下载文件"), IMPORT("import", "导入文件"), EXPORT("export", "导出文件"); - + // 枚举属性 private final String code; // 权限代码 private final String description; // 权限描述 @@ -25,16 +25,6 @@ public enum FilePermission { this.description = description; } - // 获取权限代码 - public String getCode() { - return code; - } - - // 获取权限描述 - public String getDescription() { - return description; - } - // 根据 code 查找对应的枚举 public static FilePermission fromCode(String code) { for (FilePermission permission : FilePermission.values()) { @@ -53,5 +43,15 @@ public enum FilePermission { } return codes; } + + // 获取权限代码 + public String getCode() { + return code; + } + + // 获取权限描述 + public String getDescription() { + return description; + } } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java index 4d476f3..3a6d699 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java @@ -22,6 +22,7 @@ public class EleLog { public void warn(String msg) { logger.warn(msg); } + public void error(String msg) { logger.error(msg); }