Skip to content

Commit 8a1c3ec

Browse files
Copilotgopkg-dev
Copilot
and
gopkg-dev
committed
Address code review feedback - fix ternary operators and improve comments
Co-authored-by: gopkg-dev <58848833+gopkg-dev@users.noreply.github.com>
1 parent eac02db commit 8a1c3ec

5 files changed

Lines changed: 31 additions & 27 deletions

File tree

‎continew-system/src/main/java/top/continew/admin/system/service/UserRoleService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ public interface UserRoleService {
105105
boolean isRoleIdExists(List<Long> roleIds);
106106

107107
/**
108-
* 检查系统内置用户是否在用户列表中
108+
* 检查系统内置用户是否在用户列表中，如果存在则抛出异常
109109
*
110110
* @param userIds 用户 ID 列表
111111
*/
112112
void checkSystemUserAssignment(List<Long> userIds);
113113

114114
/**
115-
* 检查系统内置用户是否在用户角色关联列表中
115+
* 检查系统内置用户是否在用户角色关联列表中，如果存在则抛出异常
116116
*
117117
* @param userRoleIds 用户角色关联 ID 列表
118118
*/

‎continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ private FileInfo upload(Object file, String parentPath, String storageCode, Stri
235235

236236
// 生成唯一文件名（处理重名情况）
237237
String originalFileName = getOriginalFileName(file);
238-
String uniqueFileName = FileNameGenerator.generateUniqueName(originalFileName, parentPath, storage.getId(), baseMapper);
238+
String uniqueFileName = FileNameGenerator.generateUniqueName(originalFileName, parentPath, storage
239+
.getId(), baseMapper);
239240

240241
UploadPretreatment uploadPretreatment = fileStorageService.of(file)
241242
.setPlatform(storage.getCode())

‎continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public MultipartUploadInitResp initMultipartUpload(MultipartUploadInitReq multiP
104104
}
105105

106106
// 生成唯一文件名（处理重名情况）
107-
String uniqueFileName = FileNameGenerator.generateUniqueName(originalFileName, parentPath, storageDO.getId(), fileMapper);
107+
String uniqueFileName = FileNameGenerator.generateUniqueName(originalFileName, parentPath, storageDO
108+
.getId(), fileMapper);
108109
multiPartUploadInitReq.setFileName(uniqueFileName);
109110

110111
StorageHandler storageHandler = storageHandlerFactory.createHandler(storageDO.getType());

‎continew-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@ public void checkSystemUserAssignment(List<Long> userIds) {
179179
.in(UserDO::getId, userIds)
180180
.eq(UserDO::getIsSystem, true)
181181
.list();
182-
CheckUtils.throwIfNotEmpty(systemUsers, "[{}] 是系统内置用户，不允许分配给非超级管理员角色",
183-
systemUsers.isEmpty() ? "" : systemUsers.get(0).getNickname());
182+
CheckUtils.throwIfNotEmpty(systemUsers, "[{}] 是系统内置用户，不允许分配给非超级管理员角色", systemUsers.get(0).getNickname());
184183
}
185184

186185
@Override
@@ -197,17 +196,13 @@ public void checkSystemUserUnassignment(List<Long> userRoleIds) {
197196
return;
198197
}
199198
// 获取用户ID列表
200-
List<Long> userIds = userRoleList.stream()
201-
.map(UserRoleDO::getUserId)
202-
.distinct()
203-
.toList();
199+
List<Long> userIds = userRoleList.stream().map(UserRoleDO::getUserId).distinct().toList();
204200
// 查询是否包含系统内置用户
205201
List<UserDO> systemUsers = userService.lambdaQuery()
206202
.select(UserDO::getId, UserDO::getNickname)
207203
.in(UserDO::getId, userIds)
208204
.eq(UserDO::getIsSystem, true)
209205
.list();
210-
CheckUtils.throwIfNotEmpty(systemUsers, "[{}] 是系统内置用户，不允许取消分配角色",
211-
systemUsers.isEmpty() ? "" : systemUsers.get(0).getNickname());
206+
CheckUtils.throwIfNotEmpty(systemUsers, "[{}] 是系统内置用户，不允许取消分配角色", systemUsers.get(0).getNickname());
212207
}
213208
}

‎continew-system/src/main/java/top/continew/admin/system/util/FileNameGenerator.java‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ private FileNameGenerator() {
5050
* <p>
5151
* 当目标目录存在同名文件时，自动添加序号后缀：
5252
* <ul>
53-
* <li>file.txt → file(1).txt → file(2).txt → ...</li>
54-
* <li>无扩展名：README → README(1) → README(2) → ...</li>
55-
* <li>隐藏文件：.gitignore → .gitignore(1) → .gitignore(2) → ...</li>
53+
* <li>file.txt → file(1).txt → file(2).txt → ...</li>
54+
* <li>无扩展名：README → README(1) → README(2) → ...</li>
55+
* <li>隐藏文件：.gitignore → .gitignore(1) → .gitignore(2) → ...</li>
5656
* </ul>
5757
* </p>
5858
*
@@ -90,7 +90,9 @@ public static String generateUniqueName(String fileName, String parentPath, Long
9090
// 安全限制，防止无限循环
9191
if (counter > 9999) {
9292
log.warn("文件名重命名超过最大限制，使用当前时间戳: {}", fileName);
93-
return baseName + "_" + System.currentTimeMillis() + (StrUtil.isNotBlank(extension) ? "." + extension : "");
93+
return baseName + "_" + System.currentTimeMillis() + (StrUtil.isNotBlank(extension)
94+
? "." + extension
95+
: "");
9496
}
9597
}
9698
}
@@ -102,18 +104,18 @@ public static String generateUniqueName(String fileName, String parentPath, Long
102104
* 示例：
103105
* </p>
104106
* <ul>
105-
* <li>"document.pdf" → ["document", "pdf"]</li>
106-
* <li>"README" → ["README", ""]</li>
107-
* <li>".gitignore" → [".gitignore", ""]</li>
108-
* <li>"archive.tar.gz" → ["archive.tar", "gz"]</li>
107+
* <li>"document.pdf" → ["document", "pdf"]</li>
108+
* <li>"README" → ["README", ""]</li>
109+
* <li>".gitignore" → [".gitignore", ""]</li>
110+
* <li>"archive.tar.gz" → ["archive.tar", "gz"]</li>
109111
* </ul>
110112
*
111113
* @param fileName 文件名
112114
* @return 数组 [基础名, 扩展名]，扩展名可能为空字符串
113115
*/
114116
public static String[] parseFileName(String fileName) {
115117
if (StrUtil.isBlank(fileName)) {
116-
return new String[]{"", ""};
118+
return new String[] {"", ""};
117119
}
118120

119121
// 处理隐藏文件（以.开头）
@@ -122,26 +124,28 @@ public static String[] parseFileName(String fileName) {
122124

123125
// 处理空文件名（如只有"."的情况）
124126
if (nameWithoutDot.isEmpty()) {
125-
return new String[]{fileName, ""};
127+
return new String[] {fileName, ""};
126128
}
127129

128130
// 查找最后一个点号位置
129131
int lastDotIndex = nameWithoutDot.lastIndexOf('.');
130132

131133
// 点号不存在或在开头（如 ".bashrc"），视为无扩展名
132134
if (lastDotIndex <= 0) {
133-
return new String[]{fileName, ""};
135+
return new String[] {fileName, ""};
134136
}
135137

136-
String baseName = isHidden ? "." + nameWithoutDot.substring(0, lastDotIndex) : nameWithoutDot.substring(0, lastDotIndex);
138+
String baseName = isHidden
139+
? "." + nameWithoutDot.substring(0, lastDotIndex)
140+
: nameWithoutDot.substring(0, lastDotIndex);
137141
String extension = nameWithoutDot.substring(lastDotIndex + 1);
138142

139143
// 扩展名不应包含路径分隔符（安全检查）
140144
if (extension.contains("/") || extension.contains("\\")) {
141-
return new String[]{fileName, ""};
145+
return new String[] {fileName, ""};
142146
}
143147

144-
return new String[]{baseName, extension};
148+
return new String[] {baseName, extension};
145149
}
146150

147151
/**
@@ -194,7 +198,10 @@ private static boolean existsByName(String parentPath, Long storageId, String na
194198
* @param fileMapper 文件Mapper
195199
* @return 文件名列表
196200
*/
197-
private static List<String> selectNamesByParentPath(String parentPath, Long storageId, String namePrefix, FileMapper fileMapper) {
201+
private static List<String> selectNamesByParentPath(String parentPath,
202+
Long storageId,
203+
String namePrefix,
204+
FileMapper fileMapper) {
198205
var wrapper = fileMapper.lambdaQuery()
199206
.eq(FileDO::getParentPath, parentPath)
200207
.eq(FileDO::getStorageId, storageId)

0 commit comments

Comments
 (0)