aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into release/3.1

Browse Source
This commit is contained in:
litianxiang
2026-04-15 15:07:04 +08:00
parent d73442d1dd c8dc38575a
commit f53fca9a09
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
View File

@@ -61,10 +61,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
, "/api/account/schoolLogin", "/api/account/enterpriseLogin", "/api/account/organizationNameSearch", , "/api/account/schoolLogin", "/api/account/enterpriseLogin", "/api/account/organizationNameSearch",
"/api/llm/stream", "/api/llm/stream",
//GlobalAwardController //GlobalAwardController
"/api/global-award/uploads/pdf/init", "/api/global-award/uploads/pdf/chunk", "/api/global-award/uploads/pdf/complete", "/api/global-award/uploads/pdf/status", "/api/global-award"
"/api/global-award/uploads/video/init", "/api/global-award/uploads/video/chunk", "/api/global-award/uploads/video/complete", "/api/global-award/uploads/video/status",
"/api/global-award/contestants/save", "/api/global-award/contestants/by-email", "/api/global-award/checkEmail", "/api/global-award/checkCode","/api/global-award/contestants/export",
"/api/global-award/contestants/export/files", "/api/global-award/contestants/count"
); );
@Override @Override

3
src/main/java/com/ai/da/mapper/primary/entity/Contestant.java
View File

@@ -68,6 +68,9 @@ public class Contestant {
@TableField("pdf_size") @TableField("pdf_size")
private Long pdfSize; private Long pdfSize;
@TableField("portfolio_url")
private String portfolioUrl;
@TableField("created_at") @TableField("created_at")
private LocalDateTime createdAt; private LocalDateTime createdAt;

2
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -756,7 +756,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
print.setPosition("[0.0,0.0]"); print.setPosition("[0.0,0.0]");
// print.setScale(1d); // print.setScale(1d);
// todo mark 将print默认scale置为0.3 // todo mark 将print默认scale置为0.3
print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setScale(Arrays.toString(new Float[]{1.0f, 1.0f}));
print.setAngle(0.0); print.setAngle(0.0);
print.setPriority(1); print.setPriority(1);
QueryWrapper<CollectionElement> getPrintboardLevel2TypeQw = new QueryWrapper<>(); QueryWrapper<CollectionElement> getPrintboardLevel2TypeQw = new QueryWrapper<>();

10
src/main/java/com/ai/da/service/impl/GlobalAwardServiceImpl.java
View File

@@ -186,6 +186,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
.videoSize(request.getVideoSize()) .videoSize(request.getVideoSize())
.pdfSize(request.getPdfSize()) .pdfSize(request.getPdfSize())
.contestantNumber(nextNumber) .contestantNumber(nextNumber)
.portfolioUrl(request.getPortfolioUrl())
.createdAt(now) .createdAt(now)
.updatedAt(now) .updatedAt(now)
.build(); .build();
@@ -226,6 +227,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
existing.setVideoDuration(request.getVideoDuration()); existing.setVideoDuration(request.getVideoDuration());
existing.setVideoSize(request.getVideoSize()); existing.setVideoSize(request.getVideoSize());
existing.setPdfSize(request.getPdfSize()); existing.setPdfSize(request.getPdfSize());
existing.setPortfolioUrl(request.getPortfolioUrl());
existing.setUpdatedAt(now); existing.setUpdatedAt(now);
contestantMapper.updateById(existing); contestantMapper.updateById(existing);
resp.put("success", true); resp.put("success", true);
@@ -243,7 +245,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
String[] headers = new String[] { String[] headers = new String[] {
"contestantNumber", "email", "firstName", "lastName", "gender", "occupation", "contestantNumber", "email", "firstName", "lastName", "gender", "occupation",
"age", "countryRegionCity", "phoneNumber", "designTitle", "designDescription", "age", "countryRegionCity", "phoneNumber", "designTitle", "designDescription",
"pdfPath", "videoPath", "videoDuration", "videoSizeMB", "pdfSizeMB", "createdAt", "updatedAt" "pdfPath", "videoPath", "videoDuration", "videoSizeMB", "pdfSizeMB", "portfolioUrl", "createdAt", "updatedAt"
}; };
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
Cell c = header.createCell(i); Cell c = header.createCell(i);
@@ -279,6 +281,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
double pMb = cst.getPdfSize() / 1024.0 / 1024.0; double pMb = cst.getPdfSize() / 1024.0 / 1024.0;
r.createCell(ci++).setCellValue(String.format("%.2f", pMb)); r.createCell(ci++).setCellValue(String.format("%.2f", pMb));
} }
r.createCell(ci++).setCellValue(cst.getPortfolioUrl() == null ? "" : cst.getPortfolioUrl());
r.createCell(ci++).setCellValue(cst.getCreatedAt() == null ? "" : cst.getCreatedAt().toString()); r.createCell(ci++).setCellValue(cst.getCreatedAt() == null ? "" : cst.getCreatedAt().toString());
r.createCell(ci++).setCellValue(cst.getUpdatedAt() == null ? "" : cst.getUpdatedAt().toString()); r.createCell(ci++).setCellValue(cst.getUpdatedAt() == null ? "" : cst.getUpdatedAt().toString());
} }
@@ -308,7 +311,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
String[] headers = new String[] { String[] headers = new String[] {
"contestantNumber", "email", "firstName", "lastName", "gender", "occupation", "contestantNumber", "email", "firstName", "lastName", "gender", "occupation",
"age", "countryRegionCity", "phoneNumber", "designTitle", "designDescription", "age", "countryRegionCity", "phoneNumber", "designTitle", "designDescription",
"pdfPath", "videoPath", "videoDuration", "videoSizeMB", "pdfSizeMB", "createdAt", "updatedAt" "pdfPath", "videoPath", "videoDuration", "videoSizeMB", "pdfSizeMB", "portfolioUrl", "createdAt", "updatedAt"
}; };
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
Cell c = header.createCell(i); Cell c = header.createCell(i);
@@ -344,6 +347,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
double pMb = cst.getPdfSize() / 1024.0 / 1024.0; double pMb = cst.getPdfSize() / 1024.0 / 1024.0;
r.createCell(ci++).setCellValue(String.format("%.2f", pMb)); r.createCell(ci++).setCellValue(String.format("%.2f", pMb));
} }
r.createCell(ci++).setCellValue(cst.getPortfolioUrl() == null ? "" : cst.getPortfolioUrl());
r.createCell(ci++).setCellValue(cst.getCreatedAt() == null ? "" : cst.getCreatedAt().toString()); r.createCell(ci++).setCellValue(cst.getCreatedAt() == null ? "" : cst.getCreatedAt().toString());
r.createCell(ci++).setCellValue(cst.getUpdatedAt() == null ? "" : cst.getUpdatedAt().toString()); r.createCell(ci++).setCellValue(cst.getUpdatedAt() == null ? "" : cst.getUpdatedAt().toString());
} }
@@ -382,6 +386,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
dto.setVideoDuration(existing.getVideoDuration()); dto.setVideoDuration(existing.getVideoDuration());
dto.setPdfSize(existing.getPdfSize()); dto.setPdfSize(existing.getPdfSize());
dto.setVideoSize(existing.getVideoSize()); dto.setVideoSize(existing.getVideoSize());
dto.setPortfolioUrl(existing.getPortfolioUrl());
return dto; return dto;
} }
@@ -543,6 +548,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
sb.append("Video Path: ").append(nullSafe(videoPath)).append("\n"); sb.append("Video Path: ").append(nullSafe(videoPath)).append("\n");
sb.append("Video Duration (seconds): ").append(contestant.getVideoDuration() != null ? contestant.getVideoDuration() : "N/A").append("\n"); sb.append("Video Duration (seconds): ").append(contestant.getVideoDuration() != null ? contestant.getVideoDuration() : "N/A").append("\n");
sb.append("Video Size (bytes): ").append(contestant.getVideoSize() != null ? contestant.getVideoSize() : "N/A").append("\n"); sb.append("Video Size (bytes): ").append(contestant.getVideoSize() != null ? contestant.getVideoSize() : "N/A").append("\n");
sb.append("Portfolio URL: ").append(nullSafe(contestant.getPortfolioUrl())).append("\n");
sb.append("Created At: ").append(contestant.getCreatedAt() != null ? contestant.getCreatedAt() : "N/A").append("\n"); sb.append("Created At: ").append(contestant.getCreatedAt() != null ? contestant.getCreatedAt() : "N/A").append("\n");
sb.append("Updated At: ").append(contestant.getUpdatedAt() != null ? contestant.getUpdatedAt() : "N/A").append("\n"); sb.append("Updated At: ").append(contestant.getUpdatedAt() != null ? contestant.getUpdatedAt() : "N/A").append("\n");