From c768057125cb96b80bf9b2ac1e0b8053b1022c3f Mon Sep 17 00:00:00 2001 From: bynt Date: Mon, 29 May 2023 18:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=A7=E5=88=AB=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/UserServiceImpl.java | 11 +++++++---- .../baiye/module/service/impl/ClueServiceImpl.java | 1 - .../java/com/baiye/task/GenderConversionTask.java | 7 +++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index e05967c2..e9c9f5c0 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -554,10 +554,13 @@ public class UserServiceImpl implements UserService { } if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) { - String username = - companyService.findById(user.getCompanyId()) - .getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername()); - user.setUsername(username); + user.setUsername(resources.getUsername()); + if (SecurityUtils.getCurrentUserId() != DefaultNumberConstants.ONE_NUMBER) { + String username = + companyService.findById(user.getCompanyId()) + .getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername()); + user.setUsername(username); + } } if (ObjectUtil.isNotNull(resources.getTemplateId())) { diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index c1335271..0624a45b 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -1231,7 +1231,6 @@ public class ClueServiceImpl implements ClueService { @Override public List> queryUnconvertedResource(Integer number, Integer limitNum) { - return clueRepository.queryGenderByNumber(number, limitNum); } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index d9f9131e..3cd8b539 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -54,13 +54,13 @@ public class GenderConversionTask { private final GenderRecordService genderRecordService; - @Scheduled(cron = "0 0/30 * * * ? ") + @Scheduled(cron = "0 0/30 0-6 * * ? ") @Transactional(rollbackFor = Exception.class) public void exchangeResource() { String fileUrl = deliveryProperties.getFileUrl(); // 单次查询10000 List> resourceList = clueService.queryUnconvertedResource - (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.TEN_THOUSAND); + (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.FIVE_THOUSAND); if (CollUtil.isNotEmpty(resourceList)) { // 对应转换 List list = Convert.toList(QueryClueDTO.class, resourceList); @@ -85,7 +85,7 @@ public class GenderConversionTask { @SneakyThrows - @Scheduled(cron = "0 0/10 * * * ? ") + @Scheduled(cron = "0 0/10 0-6 * * ? ") @Transactional(rollbackFor = Exception.class) public void receiveMail() { // 获取邮件内容 @@ -120,7 +120,6 @@ public class GenderConversionTask { String unzipPath = CompressUtil.unzipFiles(deliveryProperties.getFileUrl(), path, deliveryProperties.getZipPassword()); - File file = new File(unzipPath); File parseFile = Objects.requireNonNull (file.listFiles())[DefaultNumberConstants.ZERO_NUMBER];