From 6d12251b3980c2aad87cbe83d1b73f3f30b0da2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 10:08:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orders/service/impl/OrdersServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 479b59f6..40a2a5ff 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -669,11 +669,13 @@ public class OrdersServiceImpl extends ServiceImpl implements List orders = baseMapper.selectOrdersByOrdersNo(ordersNo, status, userId, courseId, flag, time, userName, ordersType, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), sysUserId, qdCode, sysUserName); Set courseIds = orders.stream().map(Orders::getCourseId).collect(Collectors.toSet()); - List courses = courseDao.selectBatchIds(courseIds); - Map map = courses.stream().collect(Collectors.toMap(Course::getCourseId, Course::getTitle)); - orders.parallelStream().forEach(s -> { - s.setTitle(map.get(s.getCourseId())); - }); + if(CollUtil.isNotEmpty(courseIds)) { + List courses = courseDao.selectBatchIds(courseIds); + Map map = courses.stream().collect(Collectors.toMap(Course::getCourseId, Course::getTitle)); + orders.parallelStream().forEach(s -> { + s.setTitle(map.get(s.getCourseId())); + }); + } PageInfo pageInfo = new PageInfo<>(orders); return Result.success().put("data", PageUtils.page(pageInfo)); } From c5d25a879ad83c5287540ef556626cc6d0d0cab5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 10:23:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/course/service/impl/CourseServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index cea19ce5..30224325 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -226,6 +226,7 @@ public class CourseServiceImpl extends ServiceImpl implements map.put("dyEpisodeId", ""); map.put("wxCourseDetailsId", ""); map.putAll(countMap); + map.put("courseId", courseId + ""); } PageUtils pageUtils = PageUtils.page(pageInfo); // setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); @@ -1299,10 +1300,10 @@ public class CourseServiceImpl extends ServiceImpl implements if ("start".equals(type)) { //开始播放 - courseDetailsDao.updateViewCount(details.getCourseId(),details.getCourseDetailsId(), 1); + courseDetailsDao.updateViewCount(details.getCourseId(), details.getCourseDetailsId(), 1); } else if ("end".equals(type)) { //播放完成 - courseDetailsDao.updateViewCount(details.getCourseId(),details.getCourseDetailsId(), 2); + courseDetailsDao.updateViewCount(details.getCourseId(), details.getCourseDetailsId(), 2); } return Result.success(); From 7811a9b4afc0ea9357df3a5e102cba8d90815ab4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 10:34:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/config/ShardingConfig.java | 3 --- .../sqx/modules/app/service/impl/UserServiceImpl.java | 2 -- .../java/com/sqx/modules/job/task/SpinningTask3.java | 9 +++------ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sqx/config/ShardingConfig.java b/src/main/java/com/sqx/config/ShardingConfig.java index 7cc0f0b7..801904f1 100644 --- a/src/main/java/com/sqx/config/ShardingConfig.java +++ b/src/main/java/com/sqx/config/ShardingConfig.java @@ -37,9 +37,6 @@ import java.util.*; @ConfigurationProperties(prefix = "spring.shardingsphere") public class ShardingConfig { - @Value("${spring.profiles.active}") - private String activeProfile; - /** * 读取数据源信息 */ diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 12459bb7..728645d4 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -126,8 +126,6 @@ public class UserServiceImpl extends ServiceImpl implements private final UserVipDao userVipDao; private final InviteAchievementService inviteAchievementService; - @Value("${spring.profiles.active}") - private String profiles; private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true); diff --git a/src/main/java/com/sqx/modules/job/task/SpinningTask3.java b/src/main/java/com/sqx/modules/job/task/SpinningTask3.java index aadbb678..27dfd3ee 100644 --- a/src/main/java/com/sqx/modules/job/task/SpinningTask3.java +++ b/src/main/java/com/sqx/modules/job/task/SpinningTask3.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ import java.util.List; @Component @EnableScheduling +@Profile({"prod"}) public class SpinningTask3 { @Resource @@ -27,16 +29,11 @@ public class SpinningTask3 { @Resource private DiscSpinningRecordService recordService; - @Value("${spring.profiles.active}") - private String profiles; private Logger logger = LoggerFactory.getLogger(getClass()); - @Scheduled(cron = "0 0/5 * * * ? ") + @Scheduled(cron = "0 0/1 * * * ? ") public void record() { - if (!"prod".equals(profiles)) { - return; - } record("1"); }