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

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2024-09-25 11:31:40 +08:00
parent c01acec9e6 b43f9baead
commit 9f1cf1d90e
33 changed files with 2242 additions and 1935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
View File

@@ -12,26 +12,26 @@ public class MQConfig {
// public static final String GENERATE_QUEUE = "generate-queue-test";
// ==================================================================
// public static final String GENERATE_QUEUE = "generate-queue-local";
public static final String GENERATE_QUEUE = "generate-queue-dev";
// public static final String GENERATE_QUEUE = "generate-queue-prod";
// public static final String GENERATE_QUEUE = "generate-queue-dev";
public static final String GENERATE_QUEUE = "generate-queue-prod";
//
// public static final String SR_QUEUE = "SR-queue-local";
public static final String SR_QUEUE = "SR-queue-dev";
// public static final String SR_QUEUE = "SR-queue-prod";
// public static final String SR_QUEUE = "SR-queue-dev";
public static final String SR_QUEUE = "SR-queue-prod";
//
// public static final String SR_RESULT_QUEUE = "SuperResolution-local";
public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
// public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
// public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
//
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev";
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev";
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-dev";
// public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod";
// public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-dev";
public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod";
public static final String RELIGHT_RESULT_QUEUE = "Relight-dev";
// public static final String RELIGHT_RESULT_QUEUE = "Relight-prod";
// public static final String RELIGHT_RESULT_QUEUE = "Relight-dev";
public static final String RELIGHT_RESULT_QUEUE = "Relight-prod";
public MQConfig() {
}

4
src/main/java/com/ai/da/common/config/MyTaskScheduler.java
View File

@@ -49,7 +49,7 @@ public class MyTaskScheduler {
// 定时任务，每十五天执行一次
// @Scheduled(cron = "0 0 0 ? * MON")
// @Scheduled(cron = "0 0 0 */15 * ?")
@Scheduled(cron = "0 0 0 */15 * ?")
public void checkExpiry() {
// 检测正式用户是否快要过期
QueryWrapper<Account> qw = new QueryWrapper<>();
@@ -83,7 +83,7 @@ public class MyTaskScheduler {
}
}
}
// @Scheduled(cron = "0 0 8 * * ?")
@Scheduled(cron = "0 0 8 * * ?")
public void sendTrialOrderExcelToManagements() {
// 获取前一天日期
LocalDate yesterday = LocalDate.now().minusDays(1);

6
src/main/java/com/ai/da/common/task/AccountTask.java
View File

@@ -24,7 +24,7 @@ public class AccountTask {
accountService.refreshCreditsWeekly();
}
// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
@Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
public void getPaidUser(){
// 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
accountService.extendValidityForCC();
@@ -38,7 +38,7 @@ public class AccountTask {
// 2、将到期用户置为游客
for(Account account : accountList){
log.info("参与活动的用户到期，置为游客");
log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客",account.getId(),account.getUserEmail(),account.getValidEndTime());
accountService.toVisitor(account);
}
}
@@ -53,7 +53,7 @@ public class AccountTask {
// 2、将到期用户置为游客
for(Account account : accountList){
log.info("用户有效期到期，置为游客");
log.info("用户{} : {} 于 {}账号有效期到期，置为游客", account.getId(), account.getUserEmail(),account.getValidEndTime());
accountService.toVisitor(account);
}
}

21
src/main/java/com/ai/da/common/utils/RedisUtil.java
View File

@@ -7,10 +7,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -154,6 +151,8 @@ public class RedisUtil {
return redisTemplate.keys(key);
}
public Long getSize(String key){return redisTemplate.opsForSet().size(key);}
public List<String> getMultiValue(Set<String> keys){
return redisTemplate.opsForValue().multiGet(keys);
}
@@ -216,6 +215,19 @@ public class RedisUtil {
return redisTemplate.opsForValue().increment(key, 0);
}
public Long getViewCount(String key) {
Object value = redisTemplate.opsForValue().get(key);
if (value instanceof Integer) {
return Long.valueOf((Integer) value);
} else if (value instanceof Long) {
return (Long) value;
} else if (value instanceof String) {
return Long.valueOf((String) value);
} else {
throw new IllegalArgumentException("Unexpected value type");
}
}
public final static String PERSONAL_HOMEPAGE_VIEW_KEY = "PersonalHomepage:view:";
public void increasePersonalHomepageViewCount(Long accountId) {
@@ -228,5 +240,4 @@ public class RedisUtil {
return redisTemplate.opsForValue().increment(key, 0);
}
}