From b30d7673d7e85db9a27e04a57448a2b4beb130b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 16:08:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AppAnnouncementController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java index 1134e73a..cf646aba 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java @@ -23,7 +23,7 @@ public class AppAnnouncementController { } @GetMapping - public Result get(@RequestParam Integer type) { + public Result get(@RequestParam(defaultValue = "0") Integer type) { PageHelper.startPage(1,1); List list = announcementService.list(new LambdaQueryWrapper() .eq(Announcement::getType, type) From d78388fed3d910e43e8aed130c27a7ca616c0dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 16:16:42 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AppAnnouncementController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java index cf646aba..dab40e1f 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java @@ -29,7 +29,7 @@ public class AppAnnouncementController { .eq(Announcement::getType, type) .eq(Announcement::getState, 1) .orderByDesc(Announcement::getCreateTime)); - return Result.success().put("data", list.isEmpty() ? null : list.get(0)); + return Result.success().put("data", list); } } From aa20ba6437077563b54450fcd940ae612acc648b Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 9 Jan 2025 16:27:46 +0800 Subject: [PATCH 3/9] =?UTF-8?q?token=20=E9=9D=9E=E5=BD=BC=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/course/controller/app/AppCourseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java b/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java index ae9d6c93..75f7d227 100644 --- a/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java +++ b/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java @@ -77,7 +77,7 @@ public class AppCourseController extends AbstractController { @GetMapping("/selectCourseDetailsList") @ApiOperation("查询推荐视频") - public Result selectCourseDetailsList(@RequestHeader("token") String token) { + public Result selectCourseDetailsList(@RequestHeader(value = "token", required= false) String token) { return courseDetailsService.selectCourseDetailsList(token); } From fc01fdca2b7b1f3d2f1e517095ae31a83a986c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 16:33:48 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AppAnnouncementController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java index dab40e1f..59f86a91 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppAnnouncementController.java @@ -24,7 +24,6 @@ public class AppAnnouncementController { @GetMapping public Result get(@RequestParam(defaultValue = "0") Integer type) { - PageHelper.startPage(1,1); List list = announcementService.list(new LambdaQueryWrapper() .eq(Announcement::getType, type) .eq(Announcement::getState, 1) From e5ebc3798f3e69446c835b7ee80d7f1cb37b27db Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 9 Jan 2025 17:08:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?channel=20=E9=85=8D=E7=BD=AE=20=E5=88=9D?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++ .../java/com/sqx/nsqChannel/NsqConfig.java | 29 ++++++++++++ .../channels/Print2MessageHandlerAdapter.java | 13 ++++++ .../channels/PrintMessageHandlerAdapter.java | 15 +++++++ .../sqx/nsqChannel/config/NSQConsumers.java | 45 +++++++++++++++++++ .../config/NSQMessageHandlerAdapter.java | 6 +++ src/main/resources/application-dev.yml | 4 ++ src/main/resources/application-pay.yml | 4 ++ src/main/resources/application-prod.yml | 4 ++ 9 files changed, 125 insertions(+) create mode 100644 src/main/java/com/sqx/nsqChannel/NsqConfig.java create mode 100644 src/main/java/com/sqx/nsqChannel/channels/Print2MessageHandlerAdapter.java create mode 100644 src/main/java/com/sqx/nsqChannel/channels/PrintMessageHandlerAdapter.java create mode 100644 src/main/java/com/sqx/nsqChannel/config/NSQConsumers.java create mode 100644 src/main/java/com/sqx/nsqChannel/config/NSQMessageHandlerAdapter.java diff --git a/pom.xml b/pom.xml index 2f8fa236..dff1967f 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,11 @@ + + com.github.brainlag + nsq-client + 1.0.0.RC4 + com.aliyun dytnsapi20200217 diff --git a/src/main/java/com/sqx/nsqChannel/NsqConfig.java b/src/main/java/com/sqx/nsqChannel/NsqConfig.java new file mode 100644 index 00000000..4ba6d2a6 --- /dev/null +++ b/src/main/java/com/sqx/nsqChannel/NsqConfig.java @@ -0,0 +1,29 @@ +package com.sqx.nsqChannel; + +import com.sqx.nsqChannel.channels.Print2MessageHandlerAdapter; +import com.sqx.nsqChannel.channels.PrintMessageHandlerAdapter; +import com.sqx.nsqChannel.config.NSQConsumers; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; + +@Service +@Slf4j +public class NsqConfig { + /** + * 端口号 + */ + @Value("${nsq.port}") + private int port; + + @Value("${nsq.address}") + private String address; + + @PostConstruct + public void startNSQChannel() { + new NSQConsumers(address, port, "test", "ch1", new Print2MessageHandlerAdapter()); + new NSQConsumers(address, port, "test", "ch2", new PrintMessageHandlerAdapter()); + } +} diff --git a/src/main/java/com/sqx/nsqChannel/channels/Print2MessageHandlerAdapter.java b/src/main/java/com/sqx/nsqChannel/channels/Print2MessageHandlerAdapter.java new file mode 100644 index 00000000..b272ecee --- /dev/null +++ b/src/main/java/com/sqx/nsqChannel/channels/Print2MessageHandlerAdapter.java @@ -0,0 +1,13 @@ +package com.sqx.nsqChannel.channels; + +import com.sqx.nsqChannel.config.NSQMessageHandlerAdapter; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class Print2MessageHandlerAdapter extends NSQMessageHandlerAdapter { + @Override + public void handleMessage(byte[] message) { + System.out.println("Print2MessageHandlerAdapter message: " + new String(message)); + } + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/nsqChannel/channels/PrintMessageHandlerAdapter.java b/src/main/java/com/sqx/nsqChannel/channels/PrintMessageHandlerAdapter.java new file mode 100644 index 00000000..bc0490c5 --- /dev/null +++ b/src/main/java/com/sqx/nsqChannel/channels/PrintMessageHandlerAdapter.java @@ -0,0 +1,15 @@ +package com.sqx.nsqChannel.channels; + +import com.sqx.nsqChannel.config.NSQMessageHandlerAdapter; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class PrintMessageHandlerAdapter extends NSQMessageHandlerAdapter { + + @Override + public void handleMessage(byte[] message) { + System.out.println("PrintMessageHandlerAdapter message: " + new String(message)); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/nsqChannel/config/NSQConsumers.java b/src/main/java/com/sqx/nsqChannel/config/NSQConsumers.java new file mode 100644 index 00000000..a28f2bdb --- /dev/null +++ b/src/main/java/com/sqx/nsqChannel/config/NSQConsumers.java @@ -0,0 +1,45 @@ +package com.sqx.nsqChannel.config; + +import com.github.brainlag.nsq.NSQConsumer; +import com.github.brainlag.nsq.lookup.DefaultNSQLookup; +import com.github.brainlag.nsq.lookup.NSQLookup; + +public class NSQConsumers { + + private final String nsqLookupAddress; + private final int nsqLookupPort; + private final String topics; + private final String channelName; + private final NSQMessageHandlerAdapter handlerAdapter; + private NSQConsumer consumer; + + public NSQConsumers(String nsqLookupAddress, int nsqLookupPort,String topics, String channelName, NSQMessageHandlerAdapter handlerAdapter) { + this.nsqLookupAddress = nsqLookupAddress; + this.nsqLookupPort = nsqLookupPort; + this.topics = topics; + this.channelName = channelName; + this.handlerAdapter = handlerAdapter; + start(); + } + + public void start() { + try { + NSQLookup lookup = new DefaultNSQLookup(); + lookup.addLookupAddress(nsqLookupAddress, nsqLookupPort); + + consumer = new NSQConsumer(lookup, topics, channelName, (message) -> { + handlerAdapter.handleMessage(message.getMessage()); + message.finished(); + }); + consumer.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void stop() { + if (consumer != null) { + consumer.shutdown(); + } + } +} diff --git a/src/main/java/com/sqx/nsqChannel/config/NSQMessageHandlerAdapter.java b/src/main/java/com/sqx/nsqChannel/config/NSQMessageHandlerAdapter.java new file mode 100644 index 00000000..879225e2 --- /dev/null +++ b/src/main/java/com/sqx/nsqChannel/config/NSQMessageHandlerAdapter.java @@ -0,0 +1,6 @@ +package com.sqx.nsqChannel.config; + +public abstract class NSQMessageHandlerAdapter { + public abstract void handleMessage(byte[] message); + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b008eeef..a98e79b4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,6 +8,10 @@ pay: server: port: 8100 +nsq: + address: 47.122.26.160 + port: 4161 + # 数据源的一些配置 driver-class-name: com.mysql.cj.jdbc.Driver # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size diff --git a/src/main/resources/application-pay.yml b/src/main/resources/application-pay.yml index f75a16e4..f1896cb2 100644 --- a/src/main/resources/application-pay.yml +++ b/src/main/resources/application-pay.yml @@ -9,6 +9,10 @@ pay: server: port: 8200 +nsq: + address: 47.122.26.160 + port: 4161 + # 数据源的一些配置 driver-class-name: com.mysql.cj.jdbc.Driver # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 10161495..e45f1af2 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -8,6 +8,10 @@ pay: server: port: 8100 +nsq: + address: 127.0.0.1 + port: 4161 + # 数据源的一些配置 driver-class-name: com.mysql.cj.jdbc.Driver # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size From b58d3a7cf03a67c2f0a6a95c90d29ec75ed1640c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 17:13:39 +0800 Subject: [PATCH 6/9] =?UTF-8?q?courseMessage=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/response/CourseOrderResponse.java | 1 + .../app/service/impl/UserServiceImpl.java | 22 +++++++++++++++++-- .../com/sqx/modules/course/dao/CourseDao.java | 3 +++ .../resources/mapper/course/CourseDao.xml | 8 +++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java b/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java index de3a2fbc..5158c407 100644 --- a/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java +++ b/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java @@ -22,4 +22,5 @@ public class CourseOrderResponse implements Serializable { * 售卖金币 */ private Double coursemoney; + private Long courseId; } 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 67e45144..4a1ed2ea 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 @@ -47,11 +47,14 @@ import com.sqx.modules.app.dto.AuthDTO; import com.sqx.modules.app.dto.AuthRespDTO; import com.sqx.modules.app.entity.*; import com.sqx.modules.app.mapper.TbUserBlacklistMapper; +import com.sqx.modules.app.response.CourseOrderResponse; import com.sqx.modules.app.service.*; import com.sqx.modules.app.utils.JwtUtils; import com.sqx.modules.app.utils.UserConstantInterface; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; +import com.sqx.modules.course.dao.CourseDao; +import com.sqx.modules.course.entity.Course; import com.sqx.modules.discSpinning.service.DiscSpinningService; import com.sqx.modules.file.utils.Md5Utils; import com.sqx.modules.invite.service.InviteService; @@ -130,6 +133,8 @@ public class UserServiceImpl extends ServiceImpl implements private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true); + @Autowired + private CourseDao courseDao; public UserServiceImpl(@Lazy AliService aliService, UserInfoService userInfoService, UserVipDao userVipDao, InviteAchievementService inviteAchievementService) { this.aliService = aliService; @@ -1423,8 +1428,21 @@ public class UserServiceImpl extends ServiceImpl implements } PageHelper.startPage(page.intValue(), limit.intValue()); - List> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); - PageInfo> pageInfo = new PageInfo<>(list); + List courseList = courseDao.selectGroupCourseId(startTime, endTime); + Set collect = courseList.stream().map(CourseOrderResponse::getCourseId).collect(Collectors.toSet()); + if (!collect.isEmpty()) { + Map courseMap = courseDao.selectList(new LambdaQueryWrapper().in(Course::getCourseId, collect).select(Course::getCourseId, Course::getTitle)) + .stream().collect(Collectors.toMap(Course::getCourseId, item -> item)); + courseList.forEach(item -> { + Course course = courseMap.get(item.getCourseId()); + if (course != null) { + item.setCoursename(course.getTitle()); + } + }); + } + PageInfo pageInfo = new PageInfo<>(courseList); +// List> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); +// PageInfo> pageInfo = new PageInfo<>(list); return PageUtils.page(pageInfo, true); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDao.java index 549e2c01..e939b845 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDao.java @@ -1,6 +1,7 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sqx.modules.app.response.CourseOrderResponse; import com.sqx.modules.course.entity.Course; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,6 @@ public interface CourseDao extends BaseMapper { * @return */ List> selectCourseTitle(@Param("title")String title); + + List selectGroupCourseId(@Param("start")String startTime, @Param("end") String endTime); } diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index 4154d796..c0ac0eed 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -236,5 +236,13 @@ order by create_time desc + From db504fb664907ed69ef29787c437fa251a9ae4eb Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 9 Jan 2025 17:17:36 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20nsq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/nsqChannel/NsqConfig.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/sqx/nsqChannel/NsqConfig.java b/src/main/java/com/sqx/nsqChannel/NsqConfig.java index 4ba6d2a6..cfcea39e 100644 --- a/src/main/java/com/sqx/nsqChannel/NsqConfig.java +++ b/src/main/java/com/sqx/nsqChannel/NsqConfig.java @@ -12,18 +12,18 @@ import javax.annotation.PostConstruct; @Service @Slf4j public class NsqConfig { - /** - * 端口号 - */ - @Value("${nsq.port}") - private int port; - - @Value("${nsq.address}") - private String address; - - @PostConstruct - public void startNSQChannel() { - new NSQConsumers(address, port, "test", "ch1", new Print2MessageHandlerAdapter()); - new NSQConsumers(address, port, "test", "ch2", new PrintMessageHandlerAdapter()); - } +// /** +// * 端口号 +// */ +// @Value("${nsq.port}") +// private int port; +// +// @Value("${nsq.address}") +// private String address; +// +// @PostConstruct +// public void startNSQChannel() { +// new NSQConsumers(address, port, "test", "ch1", new Print2MessageHandlerAdapter()); +// new NSQConsumers(address, port, "test", "ch2", new PrintMessageHandlerAdapter()); +// } } From 63c1862a2be9e2a7b8971d8714907d7d88d49550 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 9 Jan 2025 17:44:02 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/course/service/impl/CourseDetailsServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index c084bec5..fe85dc37 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -241,8 +241,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl Date: Thu, 9 Jan 2025 18:20:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CourseServiceImpl.java | 20 ++++++----- .../resources/mapper/course/CourseDao.xml | 33 ------------------- 2 files changed, 11 insertions(+), 42 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 30b3b392..683b8575 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 @@ -192,17 +192,19 @@ public class CourseServiceImpl extends ServiceImpl implements PageHelper.startPage(page, limit); if (admin == null) { - List> map = baseMapper.selectCourse(classifyId, title, isRecommend, status, bannerId, + List> map = baseMapper.selectCourse(classifyId, title, isRecommend, 1, bannerId, sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); PageInfo> pageInfo = new PageInfo<>(map); List> records = pageInfo.getList(); for (Map m : records) { Integer i = courseDetailsDao.selectCount(new QueryWrapper().eq("course_id", m.get("courseId"))); + if (i != null && i.equals(0)) { + baseMapper.update(null, new LambdaUpdateWrapper() + .eq(Course::getCourseId, m.get("courseId")) + .set(Course::getUpdateTime, DateUtil.now()) + .set(Course::getStatus, 2)); + } m.put("courseDetailsCount", i == null ? 0 : i); - m.put("courseDetailsId", null); - m.put("courseDetailsName", ""); - m.put("dyEpisodeId", ""); - m.put("wxCourseDetailsId", ""); m.put("courseId", m.get("courseId").toString()); } PageUtils pageUtils = PageUtils.page(pageInfo); @@ -222,10 +224,10 @@ public class CourseServiceImpl extends ServiceImpl implements Map countMap = courseDetailsDao.countCourse(courseId); BigDecimal payMoney = ordersDao.sumPayByCourseId(courseId); map.put("payMoney", payMoney == null ? BigDecimal.ZERO : payMoney); - map.put("courseDetailsId", null); - map.put("courseDetailsName", ""); - map.put("dyEpisodeId", ""); - map.put("wxCourseDetailsId", ""); +// map.put("courseDetailsId", null); +// map.put("courseDetailsName", ""); +// map.put("dyEpisodeId", ""); +// map.put("wxCourseDetailsId", ""); map.putAll(countMap); map.put("courseId", map.get("courseId").toString()); } diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index c0ac0eed..b8c2d575 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -11,41 +11,17 @@ c.classify_id AS classifyId, c.course_id AS courseId, c.course_label AS courseLabel, - c.create_time AS createTime, c.details, c.img, c.banner_img AS bannerImg, - c.status, - c.is_delete AS isDelete, - c.msg_type AS msgType, - c.msg_url AS msgUrl, - c.pay_num AS payNum, - c.price, - c.wholesale_price AS wholesalePrice, c.is_over AS isOver, c.title, - c.is_price AS isPrice, c.title_img AS titleImg, - c.update_time AS updateTime, c.course_type AS courseType, - c.banner_id AS bannerId FROM course AS c WHERE c.is_delete = 0 - - - and c.wx_show = #{wxShow} - - - and (c.wx_show = #{wxShow} or c.wx_show is null) - - - and c.dy_show = #{dyShow} - - - and (c.dy_show = #{dyShow} or c.dy_show is null) - and c.title LIKE CONCAT('%', #{title}, '%') @@ -67,15 +43,6 @@ and c.status=#{status} - - and c.is_price=#{isPrice} - - - and c.wx_course_id is not null - - - and c.dy_status=4 - order by c.sort asc,c.create_time desc