diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java index a180c58a..594405a9 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -24,8 +24,8 @@ public class AccountTask { * 替换为 * 每个月月初只刷新教育子账号的积分 */ -// @Scheduled(cron = "0 0 16 * * ?") - @Scheduled(cron = "0 0 0 1 * ?") + @Scheduled(cron = "0 25 14 * * ?") +// @Scheduled(cron = "0 0 0 1 * ?") public void refreshCreditsMonthly() { log.info("每月1号0点 重置教育版子账号为默认积分"); accountService.refreshCreditsMonthly(); @@ -80,4 +80,9 @@ public class AccountTask { log.info("重置所有用户的用户名修改次数"); redisUtil.batchDeleteKeysWithSamePrefix(RedisUtil.NICKNAME_MODIFY_TIMES); } + + @Scheduled(cron = "0 35 14 * * ?") + public void checkEduAdminExpireStatus() { + accountService.checkEduAdminExpireStatus(); + } } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java index b3556e7c..cbe44957 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java @@ -26,7 +26,7 @@ public class ToProductImageResult implements Serializable { * ProductElement 上传的图片 * ToProductImage 以to product image的结果作为图片来源(relight) */ - @ApiModelProperty(value = "elementType") + @ApiModelProperty(value = "elementType 图片来源:DesignOutfit(design的结果) | ProductElement(上传的图片) | ToProductImage(生成的结果)") private String elementType; @ApiModelProperty(value = "url") diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 75d451ad..8b987ba9 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1071,25 +1071,31 @@ public class AccountServiceImpl extends ServiceImpl impl public void upgradeNotification() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().ne(Account::getSystemUser, 0); +// queryWrapper.lambda().eq(Account::isDeleted, 0).isNotNull(Account::getUserEmail); List accountList = accountMapper.selectList(queryWrapper); - System.out.println(accountList); int i = 0; int size = accountList.size(); for (Account account : accountList) { i ++; - try { - if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { - log.info("进度:{} / {} CN - {}", i, size, account.getUserEmail()); - SendEmailUtil.sendUpgradeNotification(account, null, 0); - } else { - log.info("进度:{} / {} EN - {}", i, size, account.getUserEmail()); - // 英文 - SendEmailUtil.sendUpgradeNotification(account, null, 1); + if (account != null && !StringUtil.isNullOrEmpty(account.getUserEmail())){ + try { + if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { + log.info("进度:{} / {} CN - {}", i, size, account.getUserEmail()); + SendEmailUtil.sendUpgradeNotification(account, null, 0); + } else { + log.info("进度:{} / {} EN - {}", i, size, account.getUserEmail()); + // 英文 + SendEmailUtil.sendUpgradeNotification(account, null, 1); + } + }catch (Exception e) { + log.error("向 {} 发送邮件失败", account.getUserEmail()); + log.error(e.getMessage()); } - }catch (Exception e) { - log.error("向 {} 发送邮件失败", account.getUserEmail()); - log.error(e.getMessage()); + } else if (account != null){ + log.warn("用户id 为 {},邮箱为空", account.getId()); + } else { + log.warn("进度:{} / {} account 为空", i, size); } } } diff --git a/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java b/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java index 8332e19f..ebf76ee4 100644 --- a/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java @@ -55,7 +55,7 @@ public class ProductImageServiceImpl implements ProductImageService { @Async @Override public void asyncInitialize(Long brandId, AuthPrincipalVo userHolder) { - System.out.println(">>> [asyncInitialize] 当前线程:" + Thread.currentThread().getName()); + log.info(">>> [asyncInitialize] 当前线程:{}", Thread.currentThread().getName()); String progressKey = String.valueOf(brandId); ProgressDTO progressDTO = redisUtil.getTaskProgressDTO(progressKey); @@ -77,7 +77,9 @@ public class ProductImageServiceImpl implements ProductImageService { progressDTO.setTotal(libraryIds.size()); int current = 0; + int size = libraryIds.size(); for (Long libraryId : libraryIds) { + log.info("Brand DNA Compute进度:{} / {}", current, size); Library library = libraryMapper.selectById(libraryId); if (Objects.isNull(library)){ continue; diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 45946802..29a02a7f 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -2398,7 +2398,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl printBoards = moduleSaveDTO.getPrintBoard(); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(CollectionElement::getProjectId, projectId); @@ -2455,7 +2455,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl colorBoards = moduleSaveDTO.getColorBoard(); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(CollectionElement::getProjectId, projectId); @@ -2489,7 +2489,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(CollectionElement::getProjectId, projectId);