From 3980da2fb1e98a11d8310bc31e5a4dffd028e6ae Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 26 Apr 2024 16:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=95=BF=E4=BF=A1=E6=81=AF=E8=BD=AC?= =?UTF-8?q?=E5=88=B0video=E4=B8=BB=E4=BD=93=20=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 ------ .../peanut/common/service/AsyncService.java | 1 - .../controller/ShopProductController.java | 12 +++++++ .../master/service/ShopProductService.java | 4 +++ .../service/impl/ShopProductServiceImpl.java | 11 ++++++ .../controller/CourseController.java | 4 +-- .../controller/ShopProductController.java | 8 +++++ .../sociology/service/ShopProductService.java | 3 ++ .../service/impl/ShopProductServiceImpl.java | 36 ++++++++++++++++--- 9 files changed, 72 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 5a8dc60d..c3565667 100644 --- a/pom.xml +++ b/pom.xml @@ -487,16 +487,6 @@ true - - central - https://maven.aliyun.com/repository/central - - true - - - true - - com.e-iceblue https://repo.e-iceblue.cn/repository/maven-public/ diff --git a/src/main/java/com/peanut/common/service/AsyncService.java b/src/main/java/com/peanut/common/service/AsyncService.java index 75754f6e..82925b23 100644 --- a/src/main/java/com/peanut/common/service/AsyncService.java +++ b/src/main/java/com/peanut/common/service/AsyncService.java @@ -4,7 +4,6 @@ import com.aliyun.vod20170321.models.GetVideoPlayAuthResponse; import com.peanut.common.utils.SpdbUtil; import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; -import com.peanut.modules.common.entity.UserCourseVideoPositionEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java index 2d20dd6c..e9dd9311 100644 --- a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java @@ -40,4 +40,16 @@ public class ShopProductController { return R.ok().put("result", res); } + @RequestMapping("/getProductDetail") + public R getProductDetail(@RequestBody Map map){ + Map detail = shopProductService.getProductDetail(map.get("productId")); + return R.ok().put("detail",detail); + } + + @RequestMapping("/editProductDetail") + public R editProductDetail(@RequestBody ShopProduct shopProduct){ + shopProductService.updateById(shopProduct); + return R.ok(); + } + } diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductService.java b/src/main/java/com/peanut/modules/master/service/ShopProductService.java index 7d4edf33..f3a86a5f 100644 --- a/src/main/java/com/peanut/modules/master/service/ShopProductService.java +++ b/src/main/java/com/peanut/modules/master/service/ShopProductService.java @@ -3,5 +3,9 @@ package com.peanut.modules.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.ShopProduct; +import java.util.Map; + public interface ShopProductService extends IService { + + Map getProductDetail(Integer productId); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java index c27128b9..e0bd27be 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java @@ -7,7 +7,18 @@ import com.peanut.modules.master.service.ShopProductService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + @Slf4j @Service("masterShopProductService") public class ShopProductServiceImpl extends ServiceImpl implements ShopProductService { + + @Override + public Map getProductDetail(Integer productId) { + ShopProduct detail = this.getById(productId); + HashMap flag = new HashMap<>(); + flag.put("detail",detail); + return flag; + } } diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 8f812042..73dffadb 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -17,8 +17,8 @@ import com.peanut.modules.master.service.CourseCatalogueChapterVideoService; import com.peanut.modules.sociology.service.CourseCatalogueChapterService; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; -import org.bytedeco.javacv.FFmpegFrameGrabber; -import org.bytedeco.javacv.FrameGrabber; +//import org.bytedeco.javacv.FFmpegFrameGrabber; +//import org.bytedeco.javacv.FrameGrabber; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java b/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java index b1b51ec8..ea22a1f8 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; @Slf4j @RestController("sociologyProduct") @@ -33,4 +34,11 @@ public class ShopProductController { } + @RequestMapping("/getProductDetail") + public R getProductDetail(@RequestBody Map map){ + Map detail = shopProductService.getProductDetail(map.get("productId")); + return R.ok().put("data",detail); + } + + } diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java index 1a4ce77d..500f41ab 100644 --- a/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java @@ -6,10 +6,13 @@ import com.peanut.modules.common.entity.ShopProduct; import com.peanut.modules.common.to.ParamTo; import java.util.List; +import java.util.Map; public interface ShopProductService extends IService { Page getMarketProductList(ParamTo param); List getProductListForCourse(Integer CatalogueId); + + Map getProductDetail(Integer productId); } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java index 11becaee..b6743204 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java @@ -3,24 +3,30 @@ package com.peanut.modules.sociology.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.modules.common.dao.BookDao; +import com.peanut.modules.common.dao.ShopProductBookDao; import com.peanut.modules.common.dao.ShopProductCourseDao; import com.peanut.modules.common.dao.ShopProductDao; -import com.peanut.modules.common.entity.ShopProduct; -import com.peanut.modules.common.entity.ShopProductCourseEntity; -import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.ShopProductService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Slf4j @Service("sociologyShopProduct") public class ShopProductServiceImpl extends ServiceImpl implements ShopProductService { @Autowired private ShopProductCourseDao shopProductCourseDao; + @Autowired + private ShopProductBookDao shopProductBookDao; + @Autowired + private BookDao bookDao; @Override public Page getMarketProductList(ParamTo param) { @@ -32,7 +38,6 @@ public class ShopProductServiceImpl extends ServiceImpl getProductListForCourse(Integer catalogueId) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); @@ -43,4 +48,27 @@ public class ShopProductServiceImpl extends ServiceImpl shopProducts = shopProductCourseDao.selectJoinList(ShopProduct.class, wrapper); return shopProducts; } + + @Override + public Map getProductDetail(Integer productId) { + ShopProduct product = this.getById(productId); + HashMap flag = new HashMap<>(); + flag.put("detail",product);//基础信息 + //查询包含的书 + MPJLambdaWrapper shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); + shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class); + shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId); + shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,productId); + List bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper); + flag.put("books",bookEntities); + //查询包含的课 + MPJLambdaWrapper shopProductCourseEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); + shopProductCourseEntityMPJLambdaWrapper.selectAll(CourseEntity.class); + shopProductCourseEntityMPJLambdaWrapper.leftJoin(CourseEntity.class,CourseEntity::getId,ShopProductCourseEntity::getCourseId); + shopProductCourseEntityMPJLambdaWrapper.eq(ShopProductCourseEntity::getProductId,productId); + List courseEntities = shopProductCourseDao.selectJoinList(CourseEntity.class, shopProductCourseEntityMPJLambdaWrapper); + flag.put("courses",courseEntities); + + return flag; + } }