zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-04-12 15:12:18 +08:00
parent 8bdd050c37 5d5aefd261
commit 3dded8bfa1
21 changed files with 252 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java Normal file
View File

@@ -0,0 +1,9 @@
package com.peanut.modules.common.dao;
import com.github.yulichang.base.MPJBaseMapper;
import com.peanut.modules.common.entity.CourseMarketEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CourseMarketDao extends MPJBaseMapper<CourseMarketEntity> {
}

9
src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java Normal file
View File

@@ -0,0 +1,9 @@
package com.peanut.modules.common.dao;
import com.github.yulichang.base.MPJBaseMapper;
import com.peanut.modules.common.entity.CourseToMarketEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CourseToMarketDao extends MPJBaseMapper<CourseToMarketEntity> {
}

3
src/main/java/com/peanut/modules/common/dao/ShopProductDao.java
View File

@@ -1,5 +1,6 @@
package com.peanut.modules.common.dao;
import com.github.yulichang.base.MPJBaseMapper;
import com.peanut.modules.common.entity.ShopProduct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +15,7 @@ import java.util.List;
* @date 2022-10-28 09:43:14
*/
@Mapper
public interface ShopProductDao extends BaseMapper<ShopProduct> {
public interface ShopProductDao extends MPJBaseMapper<ShopProduct> {
List<ShopProduct> appGetCategoryList(Integer catId);

9
src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java Normal file
View File

@@ -0,0 +1,9 @@
package com.peanut.modules.common.dao;
import com.github.yulichang.base.MPJBaseMapper;
import com.peanut.modules.common.entity.UserCourseBuyEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UserCourseBuyDao extends MPJBaseMapper<UserCourseBuyEntity> {
}

2
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -30,4 +30,6 @@ public class CourseEntity {
@TableField(exist = false)
private List<CourseCatalogueEntity> courseCatalogueEntityList;
@TableField(exist = false)
private Integer bindId;
}

28
src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java Normal file
View File

@@ -0,0 +1,28 @@
package com.peanut.modules.common.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("course_market")
public class CourseMarketEntity {
@TableId
private Integer id;
private Integer pid;
private Integer isLast;
private String title;
private Integer sort;
private Date createTime;
@TableLogic
private Integer delFlag;
}

25
src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java Normal file
View File

@@ -0,0 +1,25 @@
package com.peanut.modules.common.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("course_to_market")
public class CourseToMarketEntity {
@TableId
private Integer id;
private Integer courseId;
private Integer sociologyId;
private Date createTime;
@TableLogic
private Integer delFlag;
}

34
src/main/java/com/peanut/modules/common/entity/UserCourseBuyEntity.java Normal file
View File

@@ -0,0 +1,34 @@
package com.peanut.modules.common.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("user_course_buy")
public class UserCourseBuyEntity {
@TableId
private Integer id;
private Integer userId;
private Integer courseId;
private Integer catalogueId;
private Date createTime;
private Integer days;
private Date startTime;
private Date endTime;
@TableLogic
private Integer delFlag;
}

8
src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java
View File

@@ -18,18 +18,10 @@ public class UserToCourseEntity {
private Integer courseId;
private Integer catalogueId;
private Date createTime;
private Integer days;
private Date updateTime;
private Date startTime;
private Date endTime;
@TableLogic
private Integer delFlag;
}

13
src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java
View File

@@ -37,7 +37,7 @@ public class CourseSociologyController {
@RequestMapping("/addCourseSociology")
public R addCourseSociology(@RequestBody CourseSociologyEntity courseSociologyEntity){
courseSociologyService.save(courseSociologyEntity);
return R.ok();
return R.ok().put("sociology",courseSociologyEntity);
}
@RequestMapping("/delCourseSociology")
@@ -47,8 +47,7 @@ public class CourseSociologyController {
@RequestMapping("/editCourseSociology")
public R editCourseSociology(@RequestBody CourseSociologyEntity courseSociologyEntity){
courseSociologyService.editCourseSociology(courseSociologyEntity);
return R.ok();
return courseSociologyService.editCourseSociology(courseSociologyEntity);
}
@RequestMapping("/getCourseListForSociology")
@@ -70,8 +69,12 @@ public class CourseSociologyController {
@RequestMapping("/unbindCourseAndSociology")
public R unbindCourseAndSociology(@RequestBody CourseToSociologyEntity courseToSociologyEntity){
courseToSociologyService.removeById(courseToSociologyEntity.getId());
return R.ok();
boolean b = courseToSociologyService.removeById(courseToSociologyEntity.getId());
if(b){
return R.ok();
}else {
return R.error("error");
}
}
}

12
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
View File

@@ -19,7 +19,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
@Autowired
private CourseCatalogueChapterDao courseCatalogueChapterDao;
@Autowired
private UserToCourseDao userToCourseDao;
private UserCourseBuyDao userCourseBuyDao;
@Autowired
private ShopProductCourseDao shopProductCourseDao;
@Autowired
@@ -42,10 +42,10 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
if(integer>0){
return R.error(502,"删除失败，请先清空章节");
}
LambdaQueryWrapper<UserToCourseEntity> userToCourseEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
userToCourseEntityLambdaQueryWrapper.eq(UserToCourseEntity::getCatalogueId,id);
userToCourseEntityLambdaQueryWrapper.gt(UserToCourseEntity::getEndTime,new Date());
Integer integer1 = userToCourseDao.selectCount(userToCourseEntityLambdaQueryWrapper);
LambdaQueryWrapper<UserCourseBuyEntity> userCourseBuyEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
userCourseBuyEntityLambdaQueryWrapper.eq(UserCourseBuyEntity::getCatalogueId,id);
userCourseBuyEntityLambdaQueryWrapper.gt(UserCourseBuyEntity::getEndTime,new Date());
Integer integer1 = userCourseBuyDao.selectCount(userCourseBuyEntityLambdaQueryWrapper);
if(integer1>0){
return R.error(502,"删除失败，有人已购买此课程");
}
@@ -63,7 +63,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
@Override
public void addCourseCatalogue(CourseCatalogueEntity courseCatalogue) {
this.save(courseCatalogue);
if(courseCatalogue.getNeedCreate()==1){
if(courseCatalogue.getNeedCreate()!=null&&courseCatalogue.getNeedCreate()==1){
this.createProduct(courseCatalogue);
}

5
src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
View File

@@ -86,8 +86,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override
public R delCourse(int id) {
CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectOne(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id));
if (courseCatalogueEntity!=null){
Integer integer = courseCatalogueDao.selectCount(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id));
if (integer>0){
return R.error(501,"请先删除目录后再删除！");
}
this.removeById(id);
@@ -98,6 +98,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
public List<CourseEntity> getCourseListForSociology(int sociologyId) {
MPJLambdaWrapper<CourseToSociologyEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(CourseEntity.class);
wrapper.selectAs(CourseToSociologyEntity::getId,"bindId");
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId);
wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId);
List<CourseEntity> courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper);

10
src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
View File

@@ -29,13 +29,13 @@ public class CourseSociologyServiceImpl extends ServiceImpl<CourseSociologyDao,
@Override
public R delCourseSociology(int id) {
//查看下一级是否存在
CourseSociologyEntity one = this.getOne(new LambdaQueryWrapper<CourseSociologyEntity>().eq(CourseSociologyEntity::getPid, id));
if(one!=null){
int count = this.count(new LambdaQueryWrapper<CourseSociologyEntity>().eq(CourseSociologyEntity::getPid, id));
if(count>0){
return R.error(501,"删除失败，请先删除子项目后再尝试");
}
//查看绑定关系是否存在
CourseToSociologyEntity courseToSociologyEntity = courseToSociologyDao.selectOne(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getSociologyId, id));
if(courseToSociologyEntity!=null){
Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getSociologyId, id));
if(integer>0){
return R.error(502,"删除失败，请先解绑课程与国学标签的绑定关系");
}
this.removeById(id);
@@ -60,7 +60,7 @@ public class CourseSociologyServiceImpl extends ServiceImpl<CourseSociologyDao,
}
}
this.updateById(courseSociologyEntity);
return R.ok();
return R.ok().put("sociology",courseSociologyEntity);
}
private List<CourseSociologyEntity> sociologys(int id){

28
src/main/java/com/peanut/modules/sociology/controller/CourseController.java
View File

@@ -3,6 +3,7 @@ package com.peanut.modules.sociology.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.entity.CourseEntity;
import com.peanut.modules.common.to.ParamTo;
import com.peanut.modules.sociology.service.CourseService;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +20,11 @@ public class CourseController {
@Autowired
private CourseService courseService;
/**
* 获取用户最近学习课程列表
* @param param
* @return
*/
@RequestMapping("/getUserLateCourseList")
public R getUserLateCourseList(@RequestBody ParamTo param){
Integer userId = ShiroUtils.getUId();
@@ -27,4 +33,26 @@ public class CourseController {
return R.ok().put("page",userLateCourseList);
}
/**
* 获取营销标签下的课程列表
* @param param
* @return
*/
@RequestMapping("/getMarketCourseList")
public R getMarketCourseList(@RequestBody ParamTo param){
Page<CourseEntity> marketCourseList = courseService.getMarketCourseList(param);
return R.ok().put("courseList",marketCourseList);
}
/**
* 获取国学标签下的课程列表
* @param param
* @return
*/
@RequestMapping("/getSociologyCourseList")
public R getSociologyCourseList(@RequestBody ParamTo param){
Page sociologyCourseList = courseService.getSociologyCourseList(param);
return R.ok().put("courses",sociologyCourseList);
}
}

13
src/main/java/com/peanut/modules/sociology/controller/HomeController.java
View File

@@ -33,19 +33,16 @@ public class HomeController {
return R.ok().put("myCourse",courseList);
}
/**
*获取国学标签列表
* @param param
* @return
*/
@RequestMapping("/getSociologyLabels")
public R getSociologyLabels(@RequestBody ParamTo param){
List<CourseSociologyEntity> sociologyLabels = courseSociologyService.getSociologyLabels(param.getId());
return R.ok().put("labels",sociologyLabels);
}
@RequestMapping("/getSociologyCourseList")
public R getSociologyCourseList(@RequestBody ParamTo param){
Page sociologyCourseList = courseService.getSociologyCourseList(param);
return R.ok().put("courses",sociologyCourseList);
}
}

14
src/main/java/com/peanut/modules/sociology/controller/ProductController.java
View File

@@ -1,14 +0,0 @@
package com.peanut.modules.sociology.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController("sociologyProduct")
@RequestMapping("sociology/product")
public class ProductController {
}

27
src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java Normal file
View File

@@ -0,0 +1,27 @@
package com.peanut.modules.sociology.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.peanut.common.utils.R;
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.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController("sociologyProduct")
@RequestMapping("sociology/product")
public class ShopProductController {
@Autowired
private ShopProductService shopProductService;
@RequestMapping("/getMarketProductList")
public R getMarketProductList(@RequestBody ParamTo param){
Page marketProductList = shopProductService.getMarketProductList(param);
return R.ok().put("products",marketProductList);
}
}

2
src/main/java/com/peanut/modules/sociology/service/CourseService.java
View File

@@ -17,4 +17,6 @@ public interface CourseService extends IService<CourseEntity> {
Page<CourseEntity> getUserLateCourseList(ParamTo param);
Page<CourseEntity> getMarketCourseList(ParamTo param);
}

11
src/main/java/com/peanut/modules/sociology/service/ShopProductService.java Normal file
View File

@@ -0,0 +1,11 @@
package com.peanut.modules.sociology.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.peanut.modules.common.entity.ShopProduct;
import com.peanut.modules.common.to.ParamTo;
public interface ShopProductService extends IService<ShopProduct> {
Page getMarketProductList(ParamTo param);
}

12
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.peanut.modules.common.dao.CourseDao;
import com.peanut.modules.common.dao.CourseToSociologyDao;
import com.peanut.modules.common.dao.UserToCourseDao;
import com.peanut.modules.common.entity.CourseEntity;
import com.peanut.modules.common.entity.CourseToMarketEntity;
import com.peanut.modules.common.entity.CourseToSociologyEntity;
import com.peanut.modules.common.entity.UserToCourseEntity;
import com.peanut.modules.common.to.ParamTo;
@@ -65,6 +66,17 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId);
wrapper.eq(UserToCourseEntity::getUserId,param.getId());
wrapper.orderByDesc(UserToCourseEntity::getUpdateTime);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
return courseEntityPage;
}
@Override
public Page<CourseEntity> getMarketCourseList(ParamTo param) {
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToMarketEntity::getId,param.getId());
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
return courseEntityPage;
}

27
src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java Normal file
View File

@@ -0,0 +1,27 @@
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.ShopProductDao;
import com.peanut.modules.common.entity.ShopProduct;
import com.peanut.modules.common.entity.ShopProductToSociologyMarket;
import com.peanut.modules.common.to.ParamTo;
import com.peanut.modules.sociology.service.ShopProductService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service("sociologyShopProduct")
public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProduct> implements ShopProductService {
@Override
public Page getMarketProductList(ParamTo param) {
MPJLambdaWrapper<ShopProduct> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(ShopProduct.class);
wrapper.leftJoin(ShopProductToSociologyMarket.class,ShopProductToSociologyMarket::getProductId,ShopProduct::getProductId);
wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,param.getId());
Page<ShopProduct> shopProductPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper);
return shopProductPage;
}
}