Compare commits

...

2 Commits

Author SHA1 Message Date
7b3d4e2a65 nullable ttl arg for temp file 2025-12-22 11:01:21 +08:00
4e113e8fae update firstNotNull 2025-12-22 11:00:52 +08:00
7 changed files with 7 additions and 7 deletions

View File

@ -386,7 +386,7 @@ public class CommonController {
*/ */
@AOPLog @AOPLog
@PostMapping("/temp/file/upload") @PostMapping("/temp/file/upload")
public List<TempFileResponse> tempFileUpload(@RequestParam("file") List<MultipartFile> files, @RequestParam("ttl") Long ttl) { public List<TempFileResponse> tempFileUpload(@RequestParam("file") List<MultipartFile> files, @RequestParam(value = "ttl", required = false) Long ttl) {
return tempFileService.store(files, ttl); return tempFileService.store(files, ttl);
} }

View File

@ -63,7 +63,7 @@ public class TempFileServiceImplement implements TempFileService {
} }
public List<TempFileResponse> store(List<MultipartFile> files, Long ttl) throws TimiException { public List<TempFileResponse> store(List<MultipartFile> files, Long ttl) throws TimiException {
ttl = TimiJava.firstNotNull(ttl, DEFAULT_TTL); ttl = TimiJava.defaultIfNull(ttl, DEFAULT_TTL);
TimiException.requiredTrue(0 < ttl && ttl <= MAX_TTL, "ttl must be between 1ms and 3 days(259200000ms)"); TimiException.requiredTrue(0 < ttl && ttl <= MAX_TTL, "ttl must be between 1ms and 3 days(259200000ms)");
long newFileSize = files.stream().mapToLong(MultipartFile::getSize).sum(); long newFileSize = files.stream().mapToLong(MultipartFile::getSize).sum();

View File

@ -56,7 +56,7 @@ public class ServerServiceImplement implements ServerService {
public void report(ReportRequest request) { public void report(ReportRequest request) {
ServerStatus status = serverMap.get(request.getId()); ServerStatus status = serverMap.get(request.getId());
if (status != null) { if (status != null) {
request.setBaseInfo(TimiJava.firstNotNull(request.getBaseInfo(), status.getBaseInfo())); request.setBaseInfo(TimiJava.defaultIfNull(request.getBaseInfo(), status.getBaseInfo()));
if (request.getBaseInfo() == null || TimiJava.isEmpty(request.getBaseInfo().getCore())) { if (request.getBaseInfo() == null || TimiJava.isEmpty(request.getBaseInfo().getCore())) {
// 需要报告基本信息,与调用方约定返回代码为 IGNORE // 需要报告基本信息,与调用方约定返回代码为 IGNORE
throw new TimiException(TimiCode.IGNORE); throw new TimiException(TimiCode.IGNORE);

View File

@ -106,7 +106,7 @@ public class JournalServiceImplement extends AbstractEntityService<Journal, Long
attachmentService.deleteMedia(removeId); attachmentService.deleteMedia(removeId);
} }
// 新增 // 新增
for (String tempFileId : TimiJava.firstNotNull(request.getTempFileIds(), new String[0])) { for (String tempFileId : TimiJava.defaultIfNull(request.getTempFileIds(), new String[0])) {
TempFileMetaData metadata = tempFileService.metadata(tempFileId); TempFileMetaData metadata = tempFileService.metadata(tempFileId);
Attachment sourceAttach = new Attachment(); Attachment sourceAttach = new Attachment();

View File

@ -82,7 +82,7 @@ public class TravelLocationServiceImplement extends AbstractEntityService<Travel
} }
} }
// 新增 // 新增
for (String tempFileId : TimiJava.firstNotNull(travelLocation.getTempFileIds(), new String[0])) { for (String tempFileId : TimiJava.defaultIfNull(travelLocation.getTempFileIds(), new String[0])) {
TempFileMetaData metadata = tempFileService.metadata(tempFileId); TempFileMetaData metadata = tempFileService.metadata(tempFileId);
Attachment attach = new Attachment(); Attachment attach = new Attachment();

View File

@ -95,7 +95,7 @@ public class PlayerController {
@RequestRateLimit @RequestRateLimit
@PostMapping("/list") @PostMapping("/list")
public List<MinecraftPlayer> listPlayer(@RequestHeader("Token") String token) { public List<MinecraftPlayer> listPlayer(@RequestHeader("Token") String token) {
Long userId = TimiJava.firstNotNull(redis.get(token), userToken.getUserId(token)); Long userId = TimiJava.defaultIfNull(redis.get(token), userToken.getUserId(token));
if (userId == null) { if (userId == null) {
throw new TimiException(TimiCode.RESULT_BAD).msgKey("token.illegal"); throw new TimiException(TimiCode.RESULT_BAD).msgKey("token.illegal");
} }

View File

@ -145,7 +145,7 @@ public class AsyncTaskServiceImplement implements AsyncTaskService {
for (int i = 0; i < taskList.size(); i++) { for (int i = 0; i < taskList.size(); i++) {
AbstractAsyncTask task = taskList.get(i); AbstractAsyncTask task = taskList.get(i);
task.setMessage(task.logBuffer.toString()); task.setMessage(task.logBuffer.toString());
task.setMessage(TimiJava.firstNotNull(task.getMessage(), "")); task.setMessage(TimiJava.defaultIfNull(task.getMessage(), ""));
if (IOSize.KB * 4 < task.getMessage().length()) { if (IOSize.KB * 4 < task.getMessage().length()) {
task.setMessage(task.getMessage().substring((int) (task.getMessage().length() - IOSize.KB * 4))); task.setMessage(task.getMessage().substring((int) (task.getMessage().length() - IOSize.KB * 4)));
} }