fix:参赛者根据链接返回文件参数

This commit is contained in:
litianxiang
2026-02-05 09:40:15 +08:00
parent 1ec42f4ad5
commit 3301869f20
7 changed files with 113 additions and 107 deletions

View File

@@ -559,83 +559,83 @@ public class GenerateConsumer {
log.info("============ProcessPoseTransformResult End listening=========="); log.info("============ProcessPoseTransformResult End listening==========");
} }
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer1(Message msg, Channel channel) { // public void generateConsumer1(Message msg, Channel channel) {
generate(msg, channel, "consumer 1"); // generate(msg, channel, "consumer 1");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer2(Message msg, Channel channel) { // public void generateConsumer2(Message msg, Channel channel) {
generate(msg, channel, "consumer 2"); // generate(msg, channel, "consumer 2");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer3(Message msg, Channel channel) { // public void generateConsumer3(Message msg, Channel channel) {
generate(msg, channel, "consumer 3"); // generate(msg, channel, "consumer 3");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer4(Message msg, Channel channel) { // public void generateConsumer4(Message msg, Channel channel) {
generate(msg, channel, "consumer 4"); // generate(msg, channel, "consumer 4");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer5(Message msg, Channel channel) { // public void generateConsumer5(Message msg, Channel channel) {
generate(msg, channel, "consumer 5"); // generate(msg, channel, "consumer 5");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer6(Message msg, Channel channel) { // public void generateConsumer6(Message msg, Channel channel) {
generate(msg, channel, "consumer 6"); // generate(msg, channel, "consumer 6");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer7(Message msg, Channel channel) { // public void generateConsumer7(Message msg, Channel channel) {
generate(msg, channel, "consumer 7"); // generate(msg, channel, "consumer 7");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer8(Message msg, Channel channel) { // public void generateConsumer8(Message msg, Channel channel) {
generate(msg, channel, "consumer 8"); // generate(msg, channel, "consumer 8");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
@RabbitHandler // @RabbitHandler
public void generateConsumer9(Message msg, Channel channel) { // public void generateConsumer9(Message msg, Channel channel) {
generate(msg, channel, "consumer 9"); // generate(msg, channel, "consumer 9");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
@RabbitHandler // @RabbitHandler
public void getGenerateResult(Message msg, Channel channel) { // public void getGenerateResult(Message msg, Channel channel) {
processGenerateResult(msg, channel); // processGenerateResult(msg, channel);
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
@RabbitHandler // @RabbitHandler
public void getToProductImageResult(Message msg, Channel channel) { // public void getToProductImageResult(Message msg, Channel channel) {
processToProductImageResult(msg, channel); // processToProductImageResult(msg, channel);
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
@RabbitHandler // @RabbitHandler
public void getRelightResult(Message msg, Channel channel) { // public void getRelightResult(Message msg, Channel channel) {
processRelightResult(msg, channel); // processRelightResult(msg, channel);
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}")
@RabbitHandler // @RabbitHandler
public void getPoseTransformationResult(Message msg, Channel channel) { // public void getPoseTransformationResult(Message msg, Channel channel) {
processPoseTransformResult(msg, channel); // processPoseTransformResult(msg, channel);
} // }
// @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}")
// @RabbitHandler // @RabbitHandler
// public void getDesignBatchResult(Message msg, Channel channel) { // public void getDesignBatchResult(Message msg, Channel channel) {

View File

@@ -222,16 +222,16 @@ public class SRConsumer {
taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null); taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
} }
@RabbitListener(queues = "#{rabbitMQProperties.queues.sr}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}")
@RabbitHandler // @RabbitHandler
public void SRConsumer1(Message msg, Channel channel) { // public void SRConsumer1(Message msg, Channel channel) {
superResolution(msg, channel, "consumer 1"); // superResolution(msg, channel, "consumer 1");
} // }
//
@RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}") // @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}")
@RabbitHandler // @RabbitHandler
public void SRResultConsumer1(Message msg, Channel channel) { // public void SRResultConsumer1(Message msg, Channel channel) {
getSRResult(msg, channel, "consumer 1"); // getSRResult(msg, channel, "consumer 1");
} // }
} }

View File

@@ -28,7 +28,7 @@ public class AccountTask {
* 每个月月初只刷新教育子账号的积分 * 每个月月初只刷新教育子账号的积分
*/ */
// @Scheduled(cron = "0 25 14 * * ?") // @Scheduled(cron = "0 25 14 * * ?")
@Scheduled(cron = "0 0 0 1 * ?") // @Scheduled(cron = "0 0 0 1 * ?")
public void refreshCreditsMonthly() { public void refreshCreditsMonthly() {
log.info("每月1号0点 重置教育版子账号为默认积分"); log.info("每月1号0点 重置教育版子账号为默认积分");
accountService.refreshCreditsMonthly(); accountService.refreshCreditsMonthly();
@@ -54,7 +54,7 @@ public class AccountTask {
}*/ }*/
// 每天检测正式用户到期情况每天凌晨0点执行 // 每天检测正式用户到期情况每天凌晨0点执行
@Scheduled(cron = "0 0 0 * * ?") // @Scheduled(cron = "0 0 0 * * ?")
public void paidUserToVisitor() { public void paidUserToVisitor() {
// 1、查询当前已过期正式用户或试用用户 // 1、查询当前已过期正式用户或试用用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(1); List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -77,7 +77,7 @@ public class AccountTask {
accountService.registerUserToVisitor(); accountService.registerUserToVisitor();
} }
@Scheduled(cron = "0 0 0 1 * ?") // @Scheduled(cron = "0 0 0 1 * ?")
// 每月初刷新所有用户用户名剩余修改次数 // 每月初刷新所有用户用户名剩余修改次数
public void resetUsernameModifyTimes(){ public void resetUsernameModifyTimes(){
log.info("重置所有用户的用户名修改次数"); log.info("重置所有用户的用户名修改次数");
@@ -85,17 +85,17 @@ public class AccountTask {
} }
// @Scheduled(cron = "0 35 14 * * ?") // @Scheduled(cron = "0 35 14 * * ?")
@Scheduled(cron = "0 5 0 * * ?") // @Scheduled(cron = "0 5 0 * * ?")
public void checkEduAdminExpireStatus() { public void checkEduAdminExpireStatus() {
accountService.checkEduAdminExpireStatus(); accountService.checkEduAdminExpireStatus();
} }
@Scheduled(cron = "0 5 0 * * ?") // @Scheduled(cron = "0 5 0 * * ?")
public void activeSubscriptionPlan() { public void activeSubscriptionPlan() {
subscriptionPlanService.activeSubscriptionPlan(null); subscriptionPlanService.activeSubscriptionPlan(null);
} }
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes // @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void expireSubscription() { public void expireSubscription() {
subscriptionPlanService.expireSubscription(); subscriptionPlanService.expireSubscription();
} }

View File

@@ -38,7 +38,7 @@ public class GenerateTask {
* 故这里通过定时任务做补偿 * 故这里通过定时任务做补偿
* flux五分钟查询一次万相1小时查询一次 * flux五分钟查询一次万相1小时查询一次
*/ */
@Scheduled(cron = "0 */4 * * * ?") // @Scheduled(cron = "0 */4 * * * ?")
public void fluxCompensationMechanism(){ public void fluxCompensationMechanism(){
// 1、查所有 任务还没成功、还没失败正在等待或者执行中的任务id有哪些 // 1、查所有 任务还没成功、还没失败正在等待或者执行中的任务id有哪些
// 由于获取结果的polling_url在redis中只存一天大部分结果超过一天之后就无法再找到任务小部分可以通过公共路径查到结果 // 由于获取结果的polling_url在redis中只存一天大部分结果超过一天之后就无法再找到任务小部分可以通过公共路径查到结果
@@ -98,7 +98,7 @@ public class GenerateTask {
} }
// 万相 -> pose transformation 补偿 当前任务执行完后5分钟再执行一次不会出现任务重叠的情况 // 万相 -> pose transformation 补偿 当前任务执行完后5分钟再执行一次不会出现任务重叠的情况
@Scheduled(fixedDelay = 5 * 60 * 1000) // @Scheduled(fixedDelay = 5 * 60 * 1000)
public void wxCompensationMechanism(){ public void wxCompensationMechanism(){
List<APIGenerate> apiGenerates = apiGenerateService.getPendingTaskByStatus("wx"); List<APIGenerate> apiGenerates = apiGenerateService.getPendingTaskByStatus("wx");
if (apiGenerates != null && !apiGenerates.isEmpty()){ if (apiGenerates != null && !apiGenerates.isEmpty()){

View File

@@ -97,14 +97,14 @@ public class PaymentTask {
// //
} }
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes // @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void updateAffiliateInfoWithPayment(){ public void updateAffiliateInfoWithPayment(){
// log.info("佣金计算定时器"); // log.info("佣金计算定时器");
affiliateService.updateAffiliateInfoWithPayment(); affiliateService.updateAffiliateInfoWithPayment();
} }
// 定时同步(每分钟一次) // 定时同步(每分钟一次)
@Scheduled(fixedRate = 60000) // @Scheduled(fixedRate = 60000)
public void syncLinkViewCountToDB(){ public void syncLinkViewCountToDB(){
affiliateService.syncLinkViewCountToDB(); affiliateService.syncLinkViewCountToDB();
} }
@@ -120,7 +120,7 @@ public class PaymentTask {
} }
} }
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes // @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void calcCouponsCommission(){ public void calcCouponsCommission(){
// log.info("优惠券佣金计算定时器"); // log.info("优惠券佣金计算定时器");
affiliateService.calcCouponsCommission(); affiliateService.calcCouponsCommission();

View File

@@ -384,6 +384,9 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
dto.setDesignDescription(existing.getDesignDescription()); dto.setDesignDescription(existing.getDesignDescription());
dto.setPdfPath(existing.getPdfPath()); dto.setPdfPath(existing.getPdfPath());
dto.setVideoPath(existing.getVideoPath()); dto.setVideoPath(existing.getVideoPath());
dto.setVideoDuration(existing.getVideoDuration());
dto.setPdfSize(existing.getPdfSize());
dto.setVideoSize(existing.getVideoSize());
return dto; return dto;
} }

View File

@@ -5,4 +5,7 @@
#spring.profiles.active=prod #spring.profiles.active=prod
#<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) #<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
spring.profiles.active=dev #spring.profiles.active=dev
spring.profiles.active=local