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

Merge branch 'refs/heads/release/3.0' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
This commit is contained in:
xupei
2024-09-24 10:27:18 +08:00
parent 3eb8626831 8ee6a529a0
commit 2f1b22d423
12 changed files with 190 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,13 @@ public class MQConfig {
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 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 MQConfig() {
}

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

@@ -31,20 +31,20 @@ public class AccountTask {
}
// 每天凌晨0点执行一次
// @Scheduled(cron = "0 0 0 * * ?")
@Scheduled(cron = "0 0 0 * * ?")
public void cancelActivityBenefits(){
// 1、查询当前所有参与了活动且过期的用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
// 2、将到期用户置为游客
for(Account account : accountList){
log.info("参与活动的用户到期，置为游客");
log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客",account.getId(),account.getUserEmail(),account.getValidEndTime());
accountService.toVisitor(account);
}
}
// 每天检测正式用户到期情况，每天凌晨0点执行
// @Scheduled(cron = "0 0 0 * * ?")
@Scheduled(cron = "0 0 0 * * ?")
public void paidUserToVisitor(){
// 1、查询当前已过期正式用户或试用用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -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);
}
}

20
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) {