diff --git a/src/main/java/com/sqx/common/utils/Query.java b/src/main/java/com/sqx/common/utils/Query.java deleted file mode 100644 index bbddb661..00000000 --- a/src/main/java/com/sqx/common/utils/Query.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.sqx.common.utils; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.sqx.common.xss.SQLFilter; -import org.apache.commons.lang.StringUtils; - -import java.util.Map; - -/** - * 查询参数 - * - */ -public class Query { - - public IPage getPage(Map params) { - return this.getPage(params, null, false); - } - - public IPage getPage(Map params, String defaultOrderField, boolean isAsc) { - //分页参数 - long curPage = 1; - long limit = 10; - - if(params.get(Constant.PAGE) != null){ - curPage = Long.parseLong(String.valueOf(params.get(Constant.PAGE))); - } - if(params.get(Constant.LIMIT) != null){ - limit = Long.parseLong(String.valueOf(params.get(Constant.LIMIT))); - } - - //分页对象 - Page page = new Page<>(curPage, limit); - - //分页参数 - params.put(Constant.PAGE, page); - - //排序字段 - //防止SQL注入（因为sidx、order是通过拼接SQL实现排序的，会有SQL注入风险） - String orderField = SQLFilter.sqlInject((String)params.get(Constant.ORDER_FIELD)); - String order = (String)params.get(Constant.ORDER); - - - //前端字段排序 - if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){ - if(Constant.ASC.equalsIgnoreCase(order)) { - return page.addOrder(OrderItem.asc(orderField)); - }else { - return page.addOrder(OrderItem.desc(orderField)); - } - } - - //没有排序字段，则不排序 - if(StringUtils.isBlank(defaultOrderField)){ - return page; - } - - //默认排序 - if(isAsc) { - page.addOrder(OrderItem.asc(defaultOrderField)); - }else { - page.addOrder(OrderItem.desc(defaultOrderField)); - } - - return page; - } -} diff --git a/src/main/java/com/sqx/modules/app/controller/AppUpgradeController.java b/src/main/java/com/sqx/modules/app/controller/AppUpgradeController.java index a09d2a66..51249628 100644 --- a/src/main/java/com/sqx/modules/app/controller/AppUpgradeController.java +++ b/src/main/java/com/sqx/modules/app/controller/AppUpgradeController.java @@ -1,8 +1,9 @@ package com.sqx.modules.app.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.entity.App; import com.sqx.modules.app.service.AppService; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * APP登录授权 @@ -30,8 +32,10 @@ public class AppUpgradeController { @ApiOperation("管理平台升级详情") @ResponseBody public Result list(Integer page,Integer limit) { - IPage pages =new Page<>(page,limit); - return Result.success().put("data",iAppService.page(pages)); + PageHelper.startPage(page,limit); + List list = iAppService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index 7ff0b9bf..4c4933ea 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -1,8 +1,8 @@ package com.sqx.modules.app.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.entity.UserEntity; @@ -270,9 +270,10 @@ public class UserController { @GetMapping("/courseMessage") @ApiOperation("短剧分析") public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) { - Page> iPage = new Page<>(page, limit); - IPage> mapIPage = userService.queryCourseOrder(iPage, type, TimeCompleteUtils.completeStartTime(date), sysUserId); - return Result.success().put("data", new PageUtils(mapIPage)); + PageHelper.startPage(page.intValue(), limit.intValue()); + List> list = userService.queryCourseOrder(type, TimeCompleteUtils.completeStartTime(date), sysUserId); + PageInfo> pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } /** diff --git a/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java b/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java index 97aa1266..8e63357a 100644 --- a/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java @@ -1,6 +1,8 @@ package com.sqx.modules.app.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Calendar; import java.util.Date; +import java.util.List; @RestController @Api(value = "会员管理", tags = {"会员管理"}) @@ -89,7 +92,10 @@ public class VipDetailsController { @ApiParam("查询会员列表") @GetMapping("/selectVipDetailsList") public Result selectVipDetailsList(Integer page,Integer limit) { - return Result.success().put("data",new PageUtils(vipDetailsService.page(new Page<>(page,limit)))); + PageHelper.startPage(page,limit); + List list = vipDetailsService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } } diff --git a/src/main/java/com/sqx/modules/app/dao/UserDao.java b/src/main/java/com/sqx/modules/app/dao/UserDao.java index 97df46fd..e0415bd3 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java @@ -17,7 +17,7 @@ import java.util.Map; public interface UserDao extends BaseMapper { - IPage selectUserPage(@Param("page") Page page, @Param("search") String search, @Param("sex") Integer sex, @Param("platform") String platform, + List selectUserPage(@Param("search") String search, @Param("sex") Integer sex, @Param("platform") String platform, @Param("sysPhone") String sysPhone, @Param("status") Integer status, @Param("member") Integer member, @Param("inviterCode") String inviterCode, @Param("userName") String userName, @Param("invitationCode") String invitationCode, @Param("startTime") String startTime, @@ -31,7 +31,7 @@ public interface UserDao extends BaseMapper { Double queryPayMoney(@Param("type") int type, @Param("date") String date,String qdCode); - IPage> queryCourseOrder(Page iPage,@Param("type") int type, @Param("start") String start, @Param("end") String end,Long sysUserId); + List> queryCourseOrder(@Param("type") int type, @Param("start") String start, @Param("end") String end,Long sysUserId); int userMessage( String date, int type,String qdCode,Integer vipType); diff --git a/src/main/java/com/sqx/modules/app/service/UserService.java b/src/main/java/com/sqx/modules/app/service/UserService.java index eb3bc9ac..11e43bca 100644 --- a/src/main/java/com/sqx/modules/app/service/UserService.java +++ b/src/main/java/com/sqx/modules/app/service/UserService.java @@ -2,8 +2,6 @@ package com.sqx.modules.app.service; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -214,7 +212,7 @@ public interface UserService extends IService { Double queryPayMoney(int type,String qdCode); - IPage> queryCourseOrder(Page> iPage, int type, String date,Long sysUserId); + List> queryCourseOrder(int type, String date,Long sysUserId); int userMessage( String date, int type,String qdCode,Integer vipType); 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 b0dab570..175d367c 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 @@ -16,7 +16,6 @@ import com.aliyuncs.IAcsClient; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.getui.push.v2.sdk.ApiHelper; @@ -31,6 +30,8 @@ import com.getui.push.v2.sdk.dto.req.message.android.GTNotification; import com.getui.push.v2.sdk.dto.req.message.ios.Alert; import com.getui.push.v2.sdk.dto.req.message.ios.Aps; import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.github.qcloudsms.SmsSingleSenderResult; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; @@ -1348,9 +1349,11 @@ public class UserServiceImpl extends ServiceImpl implements public PageUtils selectUserPage(Integer page, Integer limit, String search, Integer sex, String platform, String sysPhone, Integer status, Integer member, String inviterCode, String userName, String invitationCode, String startTime, String endTime, String qdCode, String sysUserName, Integer vipType) { - Page pages = new Page<>(page, limit); - return new PageUtils(baseMapper.selectUserPage(pages, search, sex, platform, sysPhone, status, member, - inviterCode, userName, invitationCode, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), qdCode, sysUserName, vipType)); + PageHelper.startPage(page, limit); + List entities = baseMapper.selectUserPage(search, sex, platform, sysPhone, status, member, + inviterCode, userName, invitationCode, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), qdCode, sysUserName, vipType); + PageInfo pageInfo = new PageInfo<>(entities); + return PageUtils.page(pageInfo); } @Override @@ -1381,7 +1384,7 @@ public class UserServiceImpl extends ServiceImpl implements } @Override - public IPage> queryCourseOrder(Page> iPage, int type, String date, Long sysUserId) { + public List> queryCourseOrder(int type, String date, Long sysUserId) { DateTime parse = DateUtil.parse(date, "yyyy-MM-dd"); String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00"); @@ -1393,7 +1396,7 @@ public class UserServiceImpl extends ServiceImpl implements startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00"); endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59"); } - return baseMapper.queryCourseOrder(iPage, type, startTime, endTime, sysUserId); + return baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); } @Override diff --git a/src/main/java/com/sqx/modules/banner/controller/app/AppBannerController.java b/src/main/java/com/sqx/modules/banner/controller/app/AppBannerController.java index 6bf029e5..da8be333 100644 --- a/src/main/java/com/sqx/modules/banner/controller/app/AppBannerController.java +++ b/src/main/java/com/sqx/modules/banner/controller/app/AppBannerController.java @@ -3,6 +3,8 @@ package com.sqx.modules.banner.controller.app; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.banner.entity.Banner; @@ -13,6 +15,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author fang * @date 2020/7/9 @@ -38,7 +42,10 @@ public class AppBannerController { @ApiOperation("查询所有banner图") @ResponseBody public Result selectBannerPage(Integer page,Integer limit,Integer classify) { - return Result.success().put("data", new PageUtils(bannerService.page(new Page<>(page,limit),new QueryWrapper().eq("classify",classify)))); + PageHelper.startPage(page,limit); + List classify1 = bannerService.list(new QueryWrapper().eq("classify", classify)); + PageInfo pageInfo = new PageInfo<>(classify1); + return Result.success().put("data", PageUtils.page(pageInfo)); } @RequestMapping(value = "/clickBanner", method = RequestMethod.GET) @@ -49,4 +56,4 @@ public class AppBannerController { } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/banner/dao/BannerDao.java b/src/main/java/com/sqx/modules/banner/dao/BannerDao.java index e8b1dc80..1d9d46a8 100644 --- a/src/main/java/com/sqx/modules/banner/dao/BannerDao.java +++ b/src/main/java/com/sqx/modules/banner/dao/BannerDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.banner.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.banner.entity.Banner; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java b/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java index 053132a5..deab1fb4 100644 --- a/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java +++ b/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java @@ -1,15 +1,12 @@ package com.sqx.modules.banner.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.banner.dao.BannerDao; -import com.sqx.modules.banner.entity.Activity; import com.sqx.modules.banner.entity.Banner; import com.sqx.modules.banner.service.BannerService; import com.sqx.modules.course.dao.CourseDao; @@ -85,12 +82,13 @@ public class BannerServiceImpl extends ServiceImpl implements @Override public Result clickBanner(Integer bannerId, int page, int limit) { - Page page1 = new Page<>(page, limit); + PageHelper.startPage(page, limit); QueryWrapper queryWrapper = new QueryWrapper(); //查询banner 对应短剧 queryWrapper.eq("banner_id", bannerId); - IPage coursePage = courseDao.selectPage(page1, queryWrapper); - return Result.success().put("data", coursePage); + List coursePage = courseDao.selectList(queryWrapper); + PageInfo pageInfo = new PageInfo<>(coursePage); + return Result.success().put("data", PageUtils.page(pageInfo)); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseClassificationDao.java b/src/main/java/com/sqx/modules/course/dao/CourseClassificationDao.java index 6e0c700f..07f52219 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseClassificationDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseClassificationDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.course.entity.CourseClassification; import com.sqx.modules.course.response.ClassificationResponse; import com.sqx.modules.course.response.CurriculumResponse; @@ -14,10 +12,7 @@ import java.util.Map; @Mapper public interface CourseClassificationDao extends BaseMapper { - - IPage> selectCourseClassificationPage(Page> pages, @Param("classificationName") String classificationName); - - IPage> selectCourseClassificationList(@Param("classificationName") String classificationName); + List> selectCourseClassificationList(@Param("classificationName") String classificationName); int updateDelete(@Param("id") Long id); diff --git a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java index ac228619..28b621bc 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java @@ -7,12 +7,13 @@ import com.sqx.modules.course.entity.Course; import com.sqx.modules.course.entity.CourseCollect; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; + +import java.util.List; @Mapper public interface CourseCollectDao extends BaseMapper { - IPage selectCourseByCollect(Page page, @Param("userId") Long userId,@Param("classify") Integer classify); + List selectCourseByCollect(@Param("userId") Long userId, @Param("classify") Integer classify); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseCommentDao.java b/src/main/java/com/sqx/modules/course/dao/CourseCommentDao.java index d90e5e7a..c85c8959 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseCommentDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseCommentDao.java @@ -1,12 +1,11 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.course.entity.CourseComment; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; @Mapper @@ -14,7 +13,7 @@ public interface CourseCommentDao extends BaseMapper { int updateCourseComment(@Param("type") Integer type, @Param("courseCommentId") Long courseCommentId); - IPage selectCourseComment(Page page, @Param("courseId") Long courseId,@Param("userId") Long userId); + List selectCourseComment(@Param("courseId") Long courseId, @Param("userId") Long userId); /** * 删除评论的点赞关联 @@ -22,8 +21,8 @@ public interface CourseCommentDao extends BaseMapper { * @return */ int deleteCommentGood(@Param("courseCommentId") Long courseCommentId); - - IPage> selectCourseCommentByUserId(Page> page,@Param("userId") Long userId); - - + + List> selectCourseCommentByUserId(@Param("userId") Long userId); + + } 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 126f2c70..47fbc205 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDao.java @@ -1,12 +1,11 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.course.entity.Course; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; @Mapper @@ -14,16 +13,16 @@ public interface CourseDao extends BaseMapper { int updateDelete(@Param("id") Long id); - IPage> selectCourse(Page> pages, @Param("classifyId") Long classifyId, - @Param("title") String title,@Param("isRecommend") Integer isRecommend, - @Param("status") Integer status,@Param("bannerId") Long bannerId, - @Param("sort") Integer sort,@Param("startTime") String startTime, - @Param("endTime") String endTime,@Param("userId") Long userId, - @Param("isPrice") Integer isPrice,@Param("over") Integer over, - @Param("wxCourse") Integer wxCourse,@Param("dyCourse") Integer dyCourse, - @Param("wxShow") Integer wxShow,@Param("dyShow") Integer dyShow); + List> selectCourse(@Param("classifyId") Long classifyId, + @Param("title") String title, @Param("isRecommend") Integer isRecommend, + @Param("status") Integer status, @Param("bannerId") Long bannerId, + @Param("sort") Integer sort, @Param("startTime") String startTime, + @Param("endTime") String endTime, @Param("userId") Long userId, + @Param("isPrice") Integer isPrice, @Param("over") Integer over, + @Param("wxCourse") Integer wxCourse, @Param("dyCourse") Integer dyCourse, + @Param("wxShow") Integer wxShow, @Param("dyShow") Integer dyShow); - IPage> selectCourseAdmin(Page> pages, @Param("classifyId") Long classifyId, + List> selectCourseAdmin(@Param("classifyId") Long classifyId, @Param("title") String title,@Param("isRecommend") Integer isRecommend, @Param("status") Integer status,@Param("bannerId") Long bannerId, @Param("sort") Integer sort,@Param("startTime") String startTime, @@ -34,10 +33,9 @@ public interface CourseDao extends BaseMapper { /** * 根据title 模糊查询短剧 - * @param pages * @param title * @return */ - IPage> selectCourseTitle(Page> pages, @Param("title")String title); + List> selectCourseTitle(@Param("title")String title); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java index e93a28a2..d5b90e56 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.course.entity.CourseDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,12 +12,12 @@ public interface CourseDetailsDao extends BaseMapper { List findByCourseId(@Param("id") Long id,@Param("userId") Long userId); - IPage selectCoursePageByCourseId(Page page, @Param("id") Long id,@Param("good") Integer good); + List selectCoursePageByCourseId(@Param("id") Long id,@Param("good") Integer good); List findByCourseIdNotUrl(@Param("id") Long id,@Param("userId") Long userId); int deleteCourseDetails(String[] ids); - IPage selectCourseDetailsList(Page page,String randomNum,Integer wxShow,Integer dyShow); + List selectCourseDetailsList(String randomNum,Integer wxShow,Integer dyShow); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java b/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java index de0a5902..536532b1 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java @@ -1,9 +1,6 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.sqx.modules.course.entity.Course; import com.sqx.modules.course.entity.CourseUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,12 +9,6 @@ import java.util.List; @Mapper public interface CourseUserDao extends BaseMapper { - -// IPage selectLatelyCourse(Page pages, @Param("userId") Long userId); - - //子查询不能用 -// IPage selectCourseByCourseUser(Page pages, @Param("userId") Long userId); - /** * 查询用户是否订购 * diff --git a/src/main/java/com/sqx/modules/course/service/CourseUserService.java b/src/main/java/com/sqx/modules/course/service/CourseUserService.java index 4a972394..7f221b54 100644 --- a/src/main/java/com/sqx/modules/course/service/CourseUserService.java +++ b/src/main/java/com/sqx/modules/course/service/CourseUserService.java @@ -9,9 +9,5 @@ public interface CourseUserService extends IService { void updateTime(Long courseId); -// Result selectCourseUser(Integer page, Integer limit, Long userId); - -// Result selectLatelyCourse(Integer page, Integer limit, Long userId); - Result insertCourseUser(CourseUser courseUser); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseClassificationServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseClassificationServiceImpl.java index b4acde98..d2363c01 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseClassificationServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseClassificationServiceImpl.java @@ -1,8 +1,9 @@ package com.sqx.modules.course.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.course.dao.CourseClassificationDao; @@ -37,11 +38,16 @@ public class CourseClassificationServiceImpl extends ServiceImpl> pages = new Page<>(page, limit); - return Result.success().put("data", new PageUtils(baseMapper.selectCourseClassificationPage(pages, classificationName))); + if (limit == null) { + limit = 10; + } + PageHelper.startPage(page, limit); + List> list = baseMapper.selectCourseClassificationList(classificationName); + PageInfo> pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 02a33b55..2360a5d8 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -1,10 +1,11 @@ package com.sqx.modules.course.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.DateUtils; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.course.dao.CourseClassificationDao; import com.sqx.modules.course.dao.CourseCollectDao; @@ -100,15 +101,16 @@ public class CourseCollectServiceImpl extends ServiceImpl pages=new Page<>(page,limit); - IPage courseIPage = baseMapper.selectCourseByCollect(pages, userId,classify); - List courses = courseIPage.getRecords(); + PageHelper.startPage(page,limit); + List courseIPage = baseMapper.selectCourseByCollect( userId,classify); + PageInfo pageInfo = new PageInfo<>(courseIPage); + List courses = pageInfo.getList(); if (courses != null && courses.size() > 0) { for (Course course : courses) { course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); } } - return Result.success().put("data",courseIPage); + return Result.success().put("data", PageUtils.page(pageInfo)); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCommentServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCommentServiceImpl.java index 4edbaab7..1b27dab4 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCommentServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCommentServiceImpl.java @@ -1,7 +1,8 @@ package com.sqx.modules.course.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.course.dao.CourseCommentDao; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Map; @Service @@ -62,9 +64,11 @@ public class CourseCommentServiceImpl extends ServiceImpl courseCommentPage = new Page<>(page, limit); - return Result.success().put("data", new PageUtils(baseMapper.selectCourseComment(courseCommentPage, courseId,userId))); + public Result selectCourseComment(Integer page, Integer limit, Long courseId, Long userId) { + PageHelper.startPage(page, limit); + List commentList = baseMapper.selectCourseComment(courseId, userId); + PageInfo pageInfo = new PageInfo<>(commentList); + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override @@ -77,8 +81,10 @@ public class CourseCommentServiceImpl extends ServiceImpl> pages=new Page(page,limit); - return Result.success().put("data",new PageUtils(baseMapper.selectCourseCommentByUserId(pages,userId))); + public Result selectCourseCommentUser(Integer page, Integer limit, Long userId) { + PageHelper.startPage(page, limit); + List> list = baseMapper.selectCourseCommentByUserId(userId); + PageInfo> pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } } 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 abde3ffc..34c53496 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 @@ -5,11 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.exception.SqxException; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; @@ -234,6 +234,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl courseDetailsIPage = baseMapper.selectCourseDetailsList(new Page<>(page, limit), randomNum, wxShow, dyShow); + List list = baseMapper.selectCourseDetailsList(randomNum, wxShow, dyShow); + PageInfo pageInfo = new PageInfo<>(list); if (userId != null) { - List records = courseDetailsIPage.getRecords(); + List records = pageInfo.getList(); for (CourseDetails courseDetails : records) { courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper() .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1))); @@ -258,7 +260,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl().eq("course_id", courseDetails.getCourseId()))); } } - return Result.success().put("data", new PageUtils(courseDetailsIPage)); + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override 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 4a68dd00..8b7ab0f1 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 @@ -10,16 +10,16 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.RedisUtils; import com.sqx.common.utils.Result; -import com.sqx.modules.app.entity.InviteAchievement; import com.sqx.modules.app.service.InviteAchievementService; import com.sqx.modules.app.utils.JwtUtils; import com.sqx.modules.common.service.CommonInfoService; @@ -177,30 +177,36 @@ public class CourseServiceImpl extends ServiceImpl implements Map data = JSONUtil.toBean(cache, Map.class); return Result.success().put("data", data); } + + PageHelper.startPage(page, limit); if (admin == null) { - IPage> mapIPage = baseMapper.selectCourse(pages, classifyId, title, isRecommend, status, bannerId, + List> mapIPage = baseMapper.selectCourse(classifyId, title, isRecommend, status, bannerId, sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); - List> records = mapIPage.getRecords(); + PageInfo> pageInfo = new PageInfo<>(mapIPage); + List> records = pageInfo.getList(); for (Map map : records) { map.put("courseDetailsId", null); map.put("courseDetailsName", ""); map.put("dyEpisodeId", ""); map.put("wxCourseDetailsId", ""); } - setCache(cacheKey, JSONUtil.toJsonStr(new PageUtils(mapIPage))); - return Result.success().put("data", new PageUtils(mapIPage)); + PageUtils pageUtils = PageUtils.page(pageInfo); + setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); + return Result.success().put("data", pageUtils); } - IPage> mapIPage = baseMapper.selectCourseAdmin(pages, classifyId, title, isRecommend, status, bannerId, + List> mapIPage = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId, sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); - List> records = mapIPage.getRecords(); + PageInfo> pageInfo = new PageInfo<>(mapIPage); + List> records = pageInfo.getList(); for (Map map : records) { map.put("courseDetailsId", null); map.put("courseDetailsName", ""); map.put("dyEpisodeId", ""); map.put("wxCourseDetailsId", ""); } - setCache(cacheKey, JSONUtil.toJsonStr(new PageUtils(mapIPage))); - return Result.success().put("data", new PageUtils(mapIPage)); + PageUtils pageUtils = PageUtils.page(pageInfo); + setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); + return Result.success().put("data", pageUtils); } /*@Override @@ -233,8 +239,10 @@ public class CourseServiceImpl extends ServiceImpl implements @Override public Result selectCourseById(Integer page, Integer limit, Long id, Integer good) { - Page pages = new Page<>(page, limit); - return Result.success().put("data", new PageUtils(courseDetailsDao.selectCoursePageByCourseId(pages, id, good))); + PageHelper.startPage(page, limit); + List details = courseDetailsDao.selectCoursePageByCourseId(id, good); + PageInfo pageInfo = new PageInfo<>(details); + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override @@ -245,15 +253,14 @@ public class CourseServiceImpl extends ServiceImpl implements //记录或更新搜索内容 appSearchService.insetAppSearch(title, userId); } - //拼接模糊查询 - String title1 = null; - if (StringUtils.isNotBlank(title)) { - title1 = "%" + title + "%"; - return Result.success().put("data", new PageUtils(baseMapper.selectCourseTitle(pages, title1))); - } else { + if (StringUtils.isEmpty(title)) { return Result.error("请输入要搜索的内容！"); } + PageHelper.startPage(page, limit); + List> list = baseMapper.selectCourseTitle(title); + PageInfo> pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java index 37055fcf..d6cf01bf 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java @@ -2,17 +2,12 @@ package com.sqx.modules.course.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.course.dao.CourseClassificationDao; import com.sqx.modules.course.dao.CourseUserDao; -import com.sqx.modules.course.entity.Course; import com.sqx.modules.course.entity.CourseUser; import com.sqx.modules.course.service.CourseUserService; -import com.sqx.modules.orders.entity.Orders; import com.sqx.modules.orders.service.OrdersService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +15,6 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; @Service @Slf4j @@ -42,41 +36,6 @@ public class CourseUserServiceImpl extends ServiceImpl courseUserPage = new Page<>(page, limit); -// IPage iPage = baseMapper.selectCourseByCourseUser(courseUserPage, userId); -// -// List courses = iPage.getRecords(); -// if (courses != null && courses.size() > 0) { -// for (Course course : courses) { -// Orders orders = ordersService.selectOrdersByCourseIdAndUserId(userId, course.getCourseId()); -// if(orders!=null){ -// course.setOrders(orders); -// } -// course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); -// } -// } -// return Result.success().put("data", new PageUtils(iPage)); -// } - -// @Override -// public Result selectLatelyCourse(Integer page, Integer limit, Long userId) { -// Page pages = new Page<>(page, limit); -// IPage iPage = baseMapper.selectLatelyCourse(pages, userId); -// List courses = iPage.getRecords(); -// if (courses != null && courses.size() > 0) { -// for (Course course : courses) { -// Orders orders = ordersService.selectOrdersByCourseIdAndUserId(userId, course.getCourseId()); -// if(orders!=null){ -// course.setOrders(orders); -// } -// course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); -// } -// } -// return Result.success().put("data", new PageUtils(iPage)); -// } - @Override public Result insertCourseUser(CourseUser courseUser) { diff --git a/src/main/java/com/sqx/modules/helpCenter/controller/HelpWordController.java b/src/main/java/com/sqx/modules/helpCenter/controller/HelpWordController.java index 54ed66e5..50f1d481 100644 --- a/src/main/java/com/sqx/modules/helpCenter/controller/HelpWordController.java +++ b/src/main/java/com/sqx/modules/helpCenter/controller/HelpWordController.java @@ -1,8 +1,8 @@ package com.sqx.modules.helpCenter.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -32,7 +32,7 @@ public class HelpWordController { @PostMapping("/insertHelpClassify") @ApiOperation("添加帮助分类") - public Result insertHelpClassify(@RequestBody HelpClassify helpClassify){ + public Result insertHelpClassify(@RequestBody HelpClassify helpClassify) { helpClassify.setCreateTime(DateUtils.format(new Date())); helpClassifyService.save(helpClassify); return Result.success(); @@ -40,14 +40,14 @@ public class HelpWordController { @PostMapping("/updateHelpClassify") @ApiOperation("修改帮助分类") - public Result updateHelpClassify(@RequestBody HelpClassify helpClassify){ + public Result updateHelpClassify(@RequestBody HelpClassify helpClassify) { helpClassifyService.updateById(helpClassify); return Result.success(); } @PostMapping("/deleteHelpClassify") @ApiOperation("删除帮助分类") - public Result deleteHelpClassify(Long helpClassifyId){ + public Result deleteHelpClassify(Long helpClassifyId) { helpClassifyService.removeById(helpClassifyId); return Result.success(); } @@ -55,27 +55,28 @@ public class HelpWordController { @GetMapping("/selectHelpClassifyList") @ApiOperation("查询帮助分类") - public Result selectHelpClassifyList(Integer page,Integer limit,Long parentId,Integer types,String helpClassifyName){ - if(page==null || limit==null){ - List page1 = helpClassifyService.list( - new QueryWrapper() - .eq(types!=null,"types",types) - .eq(StringUtils.isNotBlank(helpClassifyName), "help_classify_name", helpClassifyName) - .eq(parentId != null, "parent_id", parentId).orderByAsc("sort")); - return Result.success().put("data",page1); + public Result selectHelpClassifyList(Integer page, Integer limit, Long parentId, Integer types, String helpClassifyName) { + if (page == null) { + page = 1; } - IPage page1 = helpClassifyService.page(new Page<>(page, limit), - new QueryWrapper() - .eq(types!=null,"types",types) - .eq(StringUtils.isNotBlank(helpClassifyName), "help_classify_name", helpClassifyName) - .eq(parentId != null, "parent_id", parentId).orderByAsc("sort")); - return Result.success().put("data",new PageUtils(page1)); + if (limit == null) { + limit = 10; + } + + PageHelper.startPage(page, limit); + List list = helpClassifyService.list(new QueryWrapper() + .eq(types != null, "types", types) + .eq(StringUtils.isNotBlank(helpClassifyName), "help_classify_name", helpClassifyName) + .eq(parentId != null, "parent_id", parentId).orderByAsc("sort")); + + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } @PostMapping("/insertHelpWord") @ApiOperation("添加帮助文档") - public Result insertHelpWord(@RequestBody HelpWord helpWord){ + public Result insertHelpWord(@RequestBody HelpWord helpWord) { helpWord.setCreateTime(DateUtils.format(new Date())); helpWordService.save(helpWord); return Result.success(); @@ -83,14 +84,14 @@ public class HelpWordController { @PostMapping("/updateHelpWord") @ApiOperation("修改帮助文档") - public Result updateHelpWord(@RequestBody HelpWord helpWord){ + public Result updateHelpWord(@RequestBody HelpWord helpWord) { helpWordService.updateById(helpWord); return Result.success(); } @PostMapping("/deleteHelpWord") @ApiOperation("删除帮助文档") - public Result deleteHelpWord(Long helpWordId){ + public Result deleteHelpWord(Long helpWordId) { helpWordService.removeById(helpWordId); return Result.success(); } @@ -98,15 +99,16 @@ public class HelpWordController { @GetMapping("/selectHelpWordList") @ApiOperation("查询帮助文档") - public Result selectHelpWordList(Integer page,Integer limit,Long helpClassifyId,String helpWordTitle){ - IPage page1 = helpWordService.page(new Page<>(page, limit), new QueryWrapper() + public Result selectHelpWordList(Integer page, Integer limit, Long helpClassifyId, String helpWordTitle) { + PageHelper.startPage(page, limit); + + List page1 = helpWordService.list(new QueryWrapper() .eq(helpClassifyId != null, "help_classify_id", helpClassifyId) .eq(StringUtils.isNotBlank(helpWordTitle), "help_word_title", helpWordTitle).orderByAsc("sort")); - return Result.success().put("data",new PageUtils(page1)); + + PageInfo pageInfo = new PageInfo<>(page1); + return Result.success().put("data", PageUtils.page(pageInfo)); } - - - } diff --git a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java index ff735d38..3499174e 100644 --- a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java +++ b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.invite.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.invite.entity.Invite; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,7 +16,7 @@ import java.util.Map; @Mapper public interface InviteDao extends BaseMapper { - IPage selectInviteList(Page> page, @Param("state") Integer state, @Param("userId") Long userId); + List selectInviteList(@Param("state") Integer state, @Param("userId") Long userId); Integer selectInviteCount(@Param("state") Integer state, @Param("userId") Long userId); Integer selectInviteCount2(@Param("code") String code); diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index dd964a1d..f37a874b 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -63,11 +63,12 @@ public class InviteServiceImpl extends ServiceImpl implements @Override public PageUtils selectInviteList(int page, int limit, Integer state, Long userId) { - Page> pages = new Page<>(page, limit); + PageHelper.startPage(page, limit); if (state == null || state == -1) { state = null; } - return new PageUtils(inviteDao.selectInviteList(pages, state, userId)); + List inviteList = inviteDao.selectInviteList(state, userId); + return PageUtils.page(new PageInfo<>(inviteList)); } diff --git a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java index 94a51a3e..754d93ba 100644 --- a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java +++ b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java @@ -2,15 +2,12 @@ package com.sqx.modules.job.service.impl; import cn.hutool.core.map.MapProxy; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.job.dao.ScheduleJobLogDao; -import com.sqx.modules.job.entity.ScheduleJobEntity; import com.sqx.modules.job.entity.ScheduleJobLogEntity; import com.sqx.modules.job.service.ScheduleJobLogService; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java index 96476189..d67b058f 100644 --- a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -3,15 +3,12 @@ package com.sqx.modules.job.service.impl; import cn.hutool.core.map.MapProxy; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.job.dao.ScheduleJobDao; -import com.sqx.modules.job.dto.RunJobDTO; import com.sqx.modules.job.entity.ScheduleJobEntity; import com.sqx.modules.job.service.ScheduleJobService; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java b/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java index f50f3d2f..ab214de5 100644 --- a/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java +++ b/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.message.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.message.entity.ActivityMessageInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java index f8cbc325..e859049d 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java @@ -2,19 +2,15 @@ package com.sqx.modules.message.service.impl; import cn.hutool.core.map.MapProxy; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.app.service.UserService; -import com.sqx.modules.job.entity.ScheduleJobLogEntity; import com.sqx.modules.message.dao.MessageInfoDao; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java index 9a1fa430..50a23cba 100644 --- a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java @@ -7,6 +7,8 @@ import com.sqx.modules.orders.entity.Orders; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface OrdersDao extends BaseMapper { @@ -14,11 +16,11 @@ public interface OrdersDao extends BaseMapper { int insertOrders(Orders orders); - IPage selectOrdersByOrdersNo(Page pages, @Param("ordersNo") String ordersNo, @Param("status") Integer status, - @Param("userId") Long userId, @Param("courseId") Long courseId, @Param("flag") Integer flag, - @Param("time") String time, @Param("userName") String userName, @Param("ordersType") Integer ordersType, - @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("sysUserId") Long sysUserId, - @Param("qdCode") String qdCode, @Param("sysUserName") String sysUserName); + List selectOrdersByOrdersNo(@Param("ordersNo") String ordersNo, @Param("status") Integer status, + @Param("userId") Long userId, @Param("courseId") Long courseId, @Param("flag") Integer flag, + @Param("time") String time, @Param("userName") String userName, @Param("ordersType") Integer ordersType, + @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("sysUserId") Long sysUserId, + @Param("qdCode") String qdCode, @Param("sysUserName") String sysUserName); int deleteOrders(String[] ids); 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 bfafba8d..e25a839f 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 @@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -657,10 +659,13 @@ public class OrdersServiceImpl extends ServiceImpl implements public Result selectOrders(Integer page, Integer limit, String ordersNo, Integer status, Long userId, Long courseId, Integer flag, String time, String userName, Integer ordersType, String startTime, String endTime, Long sysUserId, String qdCode, String sysUserName) { - Page pages = new Page<>(page, limit); + PageHelper.startPage(page, limit); - return Result.success().put("data", new PageUtils(baseMapper.selectOrdersByOrdersNo(pages, ordersNo, status, userId, courseId, - flag, time, userName, ordersType, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), sysUserId, qdCode, sysUserName))); + List orders = baseMapper.selectOrdersByOrdersNo(ordersNo, status, userId, courseId, + flag, time, userName, ordersType, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), sysUserId, qdCode, sysUserName); + PageInfo pageInfo = new PageInfo<>(orders); + + return Result.success().put("data", PageUtils.page(pageInfo)); } @Override diff --git a/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java b/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java index 066eabe7..95c86868 100644 --- a/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java +++ b/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java @@ -1,15 +1,11 @@ package com.sqx.modules.oss.service.impl; import cn.hutool.core.map.MapProxy; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Query; -import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.oss.dao.SysOssDao; import com.sqx.modules.oss.entity.SysOssEntity; import com.sqx.modules.oss.service.SysOssService; @@ -29,5 +25,5 @@ public class SysOssServiceImpl extends ServiceImpl impl PageHelper.startPage((int) pageNum, (int) pageSize); return PageUtils.page(new PageInfo<>(this.list())); } - + } diff --git a/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java b/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java index 137277cb..df77bf5f 100644 --- a/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java +++ b/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java @@ -2,6 +2,8 @@ package com.sqx.modules.pay.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.pay.entity.PayClassify; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * @author fang @@ -31,7 +34,7 @@ public class PayClassifyController { @PostMapping("/insertPayClassify") @ApiOperation("添加充值分类") - public Result insertPayClassify(@RequestBody PayClassify payClassify){ + public Result insertPayClassify(@RequestBody PayClassify payClassify) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); payClassify.setCreateTime(sdf.format(new Date())); payClassifyService.save(payClassify); @@ -40,26 +43,26 @@ public class PayClassifyController { @PostMapping("/updatePayClassify") @ApiOperation("修改充值分类") - public Result updatePayClassify(@RequestBody PayClassify payClassify){ + public Result updatePayClassify(@RequestBody PayClassify payClassify) { payClassifyService.updateById(payClassify); return Result.success(); } @PostMapping("/deletePayClassify") @ApiOperation("删除充值分类") - public Result deletePayClassify(Long payClassifyId){ + public Result deletePayClassify(Long payClassifyId) { payClassifyService.removeById(payClassifyId); return Result.success(); } @GetMapping("/selectPayClassifyList") @ApiOperation("查询充值分类") - public Result selectPayClassifyList(Integer page,Integer limit){ - Page pages=new Page<>(page,limit); - return Result.success().put("data",new PageUtils(payClassifyService.page(pages))); + public Result selectPayClassifyList(Integer page, Integer limit) { + PageHelper.startPage(page, limit); + List list = payClassifyService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } - - -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java index e9acd55c..44bee89d 100644 --- a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java @@ -1,17 +1,13 @@ package com.sqx.modules.pay.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.pay.entity.CashOut; -import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Map; /** * @author fang diff --git a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java index cd84b446..fd3cfefe 100644 --- a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.pay.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.pay.entity.PayDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -41,7 +39,7 @@ public interface PayDetailsDao extends BaseMapper { Double selectSumPayByClassify(@Param("time") String time, @Param("flag") Integer flag, @Param("classify") Integer classify,@Param("payClassify") Integer payClassify); - IPage> selectUserMemberList(Page> page, @Param("phone") String phone); + List> selectUserMemberList(@Param("phone") String phone); int selectPayCount(Long userId); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java index 30c18ce0..f8cfc4c9 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java @@ -57,8 +57,10 @@ public class PayDetailsServiceImpl extends ServiceImpl> pages = new Page<>(page, limit); - return new PageUtils(payDetailsDao.selectUserMemberList(pages, phone)); + PageHelper.startPage(page, limit); + List> list = payDetailsDao.selectUserMemberList(phone); + PageInfo> pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo); } @Override diff --git a/src/main/java/com/sqx/modules/sdk/controller/SdkInfoController.java b/src/main/java/com/sqx/modules/sdk/controller/SdkInfoController.java index c5c1179e..167218ac 100644 --- a/src/main/java/com/sqx/modules/sdk/controller/SdkInfoController.java +++ b/src/main/java/com/sqx/modules/sdk/controller/SdkInfoController.java @@ -2,6 +2,7 @@ package com.sqx.modules.sdk.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; import com.sqx.common.utils.Result; import com.sqx.modules.sdk.entity.SdkInfo; import com.sqx.modules.sdk.service.SdkInfoService; @@ -48,6 +49,7 @@ public class SdkInfoController { */ @GetMapping("getSdkList") public Result getSdkList(Integer page, Integer limit, SdkInfo sdkInfo) { + PageHelper.startPage(page, limit); return Result.success().put("data", infoService.getSdkList(page, limit, sdkInfo)); } diff --git a/src/main/java/com/sqx/modules/sdk/dao/SdkInfoDao.java b/src/main/java/com/sqx/modules/sdk/dao/SdkInfoDao.java index 7cc08677..c0fdfff0 100644 --- a/src/main/java/com/sqx/modules/sdk/dao/SdkInfoDao.java +++ b/src/main/java/com/sqx/modules/sdk/dao/SdkInfoDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.sdk.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.sdk.entity.SdkInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,7 +18,7 @@ import java.util.List; @Mapper public interface SdkInfoDao extends BaseMapper { - IPage getSdkPage(@Param("pages") Page pages, @Param("sdkInfo") SdkInfo sdkInfo); + List getSdkPage(@Param("sdkInfo") SdkInfo sdkInfo); List getSdkList(@Param("sdkInfo") SdkInfo sdkInfo); diff --git a/src/main/java/com/sqx/modules/sdk/service/SdkInfoService.java b/src/main/java/com/sqx/modules/sdk/service/SdkInfoService.java index b7dc158f..d426a4b5 100644 --- a/src/main/java/com/sqx/modules/sdk/service/SdkInfoService.java +++ b/src/main/java/com/sqx/modules/sdk/service/SdkInfoService.java @@ -1,7 +1,7 @@ package com.sqx.modules.sdk.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.sdk.entity.SdkInfo; import com.sqx.modules.utils.excel.ExcelData; @@ -18,7 +18,7 @@ public interface SdkInfoService extends IService { Result saveSdkInfo(Long typeId, Integer num,Long sysUserId); - IPage getSdkList(Integer page, Integer limit, SdkInfo sdkInfo); + PageUtils getSdkList(Integer page, Integer limit, SdkInfo sdkInfo); Result sdkExchange(Long userId, String sdkContent); diff --git a/src/main/java/com/sqx/modules/sdk/service/impl/SdkInfoServiceImpl.java b/src/main/java/com/sqx/modules/sdk/service/impl/SdkInfoServiceImpl.java index 1c6c0298..5c9caeb4 100644 --- a/src/main/java/com/sqx/modules/sdk/service/impl/SdkInfoServiceImpl.java +++ b/src/main/java/com/sqx/modules/sdk/service/impl/SdkInfoServiceImpl.java @@ -1,10 +1,11 @@ package com.sqx.modules.sdk.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.DateUtils; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.entity.UserVip; import com.sqx.modules.app.service.UserService; @@ -65,15 +66,14 @@ public class SdkInfoServiceImpl extends ServiceImpl impleme } @Override - public IPage getSdkList(Integer page, Integer limit, SdkInfo sdkInfo) { - Page pages; - if (page != null && limit != null) { - pages = new Page<>(page, limit); - } else { - pages = new Page<>(); - pages.setSize(-1); + public PageUtils getSdkList(Integer page, Integer limit, SdkInfo sdkInfo) { + if (page == null || limit == null) { + page = 1; + limit = -1; } - return baseMapper.getSdkPage(pages, sdkInfo); + PageHelper.startPage(page, limit); + List sdkList = baseMapper.getSdkList(sdkInfo); + return PageUtils.page(new PageInfo<>(sdkList)); } @Override diff --git a/src/main/java/com/sqx/modules/search/controller/app/AppSearchController.java b/src/main/java/com/sqx/modules/search/controller/app/AppSearchController.java index 87faa53e..664e9144 100644 --- a/src/main/java/com/sqx/modules/search/controller/app/AppSearchController.java +++ b/src/main/java/com/sqx/modules/search/controller/app/AppSearchController.java @@ -1,16 +1,14 @@ package com.sqx.modules.search.controller.app; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; -import com.sqx.modules.app.entity.App; -import com.sqx.modules.search.entity.Search; import com.sqx.modules.search.service.AppSearchService; -import com.sqx.modules.search.service.SearchService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; /** * 搜索记录 diff --git a/src/main/java/com/sqx/modules/search/service/impl/AppSearchServiceImpl.java b/src/main/java/com/sqx/modules/search/service/impl/AppSearchServiceImpl.java index f09092b3..ff534376 100644 --- a/src/main/java/com/sqx/modules/search/service/impl/AppSearchServiceImpl.java +++ b/src/main/java/com/sqx/modules/search/service/impl/AppSearchServiceImpl.java @@ -1,9 +1,6 @@ package com.sqx.modules.search.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.Result; import com.sqx.modules.search.Response.SearchResponse; @@ -17,7 +14,6 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; @Service diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index b549193e..63ef09fb 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -3,8 +3,6 @@ package com.sqx.modules.taskCenter.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.RedisKeys; diff --git a/src/main/resources/mapper/course/CourseClassificationDao.xml b/src/main/resources/mapper/course/CourseClassificationDao.xml index 73885d05..c8cd42be 100644 --- a/src/main/resources/mapper/course/CourseClassificationDao.xml +++ b/src/main/resources/mapper/course/CourseClassificationDao.xml @@ -1,14 +1,6 @@ - - select classification_id ,classification_name from course_classification where is_delete=0; - \ No newline at end of file + diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml index 4661aa1a..10dd5fc4 100644 --- a/src/main/resources/mapper/course/CourseCollectDao.xml +++ b/src/main/resources/mapper/course/CourseCollectDao.xml @@ -27,49 +27,6 @@ u.course_id, c.course_id, d.course_details_name, d.course_details_id ORDER BY produceEndTime DESC; - - diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index 18297be8..a09b00e1 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -265,7 +265,7 @@ WHERE c.is_delete = 0 and c.status=1 - and c.title LIKE #{title} + and c.title LIKE concat("%",#{title},"%") order by create_time desc