diff --git a/src/main/java/com/sqx/common/utils/PageUtils.java b/src/main/java/com/sqx/common/utils/PageUtils.java index 6e522c03..f00ff808 100644 --- a/src/main/java/com/sqx/common/utils/PageUtils.java +++ b/src/main/java/com/sqx/common/utils/PageUtils.java @@ -1,101 +1,120 @@ package com.sqx.common.utils; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.pagehelper.PageInfo; import java.io.Serializable; import java.util.List; /** * 分页工具类 - * */ public class PageUtils implements Serializable { - private static final long serialVersionUID = 1L; - /** - * 总记录数 - */ - private int totalCount; - /** - * 每页记录数 - */ - private int pageSize; - /** - * 总页数 - */ - private int totalPage; - /** - * 当前页数 - */ - private int currPage; - /** - * 列表数据 - */ - private List list; - - /** - * 分页 - * @param list 列表数据 - * @param totalCount 总记录数 - * @param pageSize 每页记录数 - * @param currPage 当前页数 - */ - public PageUtils(List list, int totalCount, int pageSize, int currPage) { - this.list = list; - this.totalCount = totalCount; - this.pageSize = pageSize; - this.currPage = currPage; - this.totalPage = (int)Math.ceil((double)totalCount/pageSize); - } + private static final long serialVersionUID = 1L; + /** + * 总记录数 + */ + private int totalCount; + /** + * 每页记录数 + */ + private int pageSize; + /** + * 总页数 + */ + private int totalPage; + /** + * 当前页数 + */ + private int currPage; + /** + * 列表数据 + */ + private List list; + private List records; - /** - * 分页 - */ - public PageUtils(IPage page) { - this.list = page.getRecords(); - this.totalCount = (int)page.getTotal(); - this.pageSize = (int)page.getSize(); - this.currPage = (int)page.getCurrent(); - this.totalPage = (int)page.getPages(); - } - public int getTotalCount() { - return totalCount; - } + public PageUtils() { + } - public void setTotalCount(int totalCount) { - this.totalCount = totalCount; - } + /** + * 分页 + * + * @param list 列表数据 + * @param totalCount 总记录数 + * @param pageSize 每页记录数 + * @param currPage 当前页数 + */ + public PageUtils(List list, int totalCount, int pageSize, int currPage) { + this.list = list; + this.totalCount = totalCount; + this.pageSize = pageSize; + this.currPage = currPage; + this.totalPage = (int) Math.ceil((double) totalCount / pageSize); + } - public int getPageSize() { - return pageSize; - } + public static PageUtils page(PageInfo page) { + return page(page,false); + } - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } + public static PageUtils page(PageInfo page, boolean isRecords) { + PageUtils pageUtils = new PageUtils(); + if (isRecords) { + pageUtils.records = page.getList(); + } else { + pageUtils.list = page.getList(); + } + pageUtils.totalCount = (int) page.getTotal(); + pageUtils.pageSize = page.getSize(); + pageUtils.currPage = page.getPageNum(); + pageUtils.totalPage = page.getPages(); + return pageUtils; + } - public int getTotalPage() { - return totalPage; - } + public int getTotalCount() { + return totalCount; + } - public void setTotalPage(int totalPage) { - this.totalPage = totalPage; - } + public void setTotalCount(int totalCount) { + this.totalCount = totalCount; + } - public int getCurrPage() { - return currPage; - } + public int getPageSize() { + return pageSize; + } - public void setCurrPage(int currPage) { - this.currPage = currPage; - } + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } - public List getList() { - return list; - } + public int getTotalPage() { + return totalPage; + } - public void setList(List list) { - this.list = list; - } - + public void setTotalPage(int totalPage) { + this.totalPage = totalPage; + } + + public int getCurrPage() { + return currPage; + } + + public void setCurrPage(int currPage) { + this.currPage = currPage; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public List getRecords() { + return records; + } + + public void setRecords(List records) { + this.records = records; + } } 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/config/ShardingConfig.java b/src/main/java/com/sqx/config/ShardingConfig.java index 297a772f..e4736525 100644 --- a/src/main/java/com/sqx/config/ShardingConfig.java +++ b/src/main/java/com/sqx/config/ShardingConfig.java @@ -6,20 +6,20 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration; import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration; import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration; +import org.apache.shardingsphere.api.config.sharding.strategy.InlineShardingStrategyConfiguration; import org.apache.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; import javax.sql.DataSource; import java.sql.SQLException; import java.util.*; -import java.util.stream.Collectors; /** @@ -31,6 +31,9 @@ import java.util.stream.Collectors; @ConfigurationProperties(prefix = "spring.shardingsphere") public class ShardingConfig { + @Value("${spring.profiles.active}") + private String activeProfile; + /** * 读取数据源信息 */ @@ -49,12 +52,46 @@ public class ShardingConfig { */ private String centerTablesDataNode; - /** * 中心表,不进行分库操作 */ - private List centerTables; + private Set centerTables; + /** + * 区域库的节点 + */ + private String regionTablesDataNode; + + /** + * 区域表分库策略的字段 + */ + private String regionTablesShardingDatabaseColumn; + + /** + * 区域表分库的算法 + */ + private String regionTablesShardingDatabaseAlgorithm; + + /** + * 分库表,通过userId进行分库 + */ + private Set regionTables; + + + /** + * 区域表分库策略的字段 + */ + private String courseDetailsShardingDatabaseColumn; + + /** + * 区域表分库的算法 + */ + private String courseDetailsShardingDatabaseAlgorithm; + + /** + * 分库表,通过userId进行分库 + */ + private Set courseDetails; /** * 配置sharding-jdbc数据源 @@ -69,6 +106,12 @@ public class ShardingConfig { // 配置表的切分策略 shardingRuleConfig.setTableRuleConfigs(addTableRuleConfigs()); + // 配置表绑定规则 + List> sets = new ArrayList<>(); + sets.add(regionTables); + shardingRuleConfig.setBindingTableGroups(bindingTableGroups(sets)); + + // 配置是否显示sql Properties props = new Properties(); props.put("sql.show", showSql); @@ -88,15 +131,36 @@ public class ShardingConfig { String.format(centerTablesDataNode, centerTable)); sets.add(tableRuleConfig); } + if ("prod".equals(activeProfile)) { + // 定义区域表的分库规则 + InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration( + regionTablesShardingDatabaseColumn, regionTablesShardingDatabaseAlgorithm); + for (String regionTable : regionTables) { + TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable)); + tableRuleConfig.setDatabaseShardingStrategyConfig(databaseShardingStrategyConfig); + sets.add(tableRuleConfig); + } -// // 定义区域表的分库规则 -// InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration( -// regionTablesShardingDatabaseColumn, regionTablesShardingDatabaseAlgorithm); -// for (String regionTable : regionTables) { -// TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable)); -// tableRuleConfig.setDatabaseShardingStrategyConfig(databaseShardingStrategyConfig); -// sets.add(tableRuleConfig); -// } + // 定义区域表的分库规则 + InlineShardingStrategyConfiguration courseDetailsShardingStrategyConfig = new InlineShardingStrategyConfiguration( + courseDetailsShardingDatabaseColumn, courseDetailsShardingDatabaseAlgorithm); + for (String regionTable : courseDetails) { + TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable)); + tableRuleConfig.setDatabaseShardingStrategyConfig(courseDetailsShardingStrategyConfig); + sets.add(tableRuleConfig); + } + }else { + for (String centerTable : regionTables) { + TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(centerTable, + String.format(centerTablesDataNode, centerTable)); + sets.add(tableRuleConfig); + } + for (String centerTable : courseDetails) { + TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(centerTable, + String.format(centerTablesDataNode, centerTable)); + sets.add(tableRuleConfig); + } + } return sets; } @@ -136,4 +200,38 @@ public class ShardingConfig { }); return sets; } + + /** + * 绑定表的分片规则 + */ + public static Set bindingTableGroups(List> sets) { + if (sets != null && !sets.isEmpty()) { + Set tableGroups = new HashSet<>(); + for (Set set : sets) { + String tableNames = bindingTable(set.toArray(new String[0])); + if (StringUtils.isNotBlank(tableNames)) { + tableGroups.add(tableNames); + } + } + return tableGroups; + } + return null; + } + + /** + * 批量绑定表规则 + * + * @param tables 批量绑定的标规则 + * @return tableNames + */ + private static String bindingTable(String... tables) { + StringBuilder tableNames = new StringBuilder(); + if (tables != null && tables.length != 0) { + for (String table : tables) { + tableNames.append(table).append(","); + } + tableNames.deleteCharAt(tableNames.length() - 1); + } + return tableNames.toString(); + } } \ No newline at end of file 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..02c1dbdd 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, true)); } 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..b1def84d 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,8 @@ 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)); + PageUtils pageUtils = userService.queryCourseOrder(page, limit, type, TimeCompleteUtils.completeStartTime(date), sysUserId); + return Result.success().put("data", pageUtils); } /** 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..037fe2eb 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.app.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.app.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,7 +15,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,13 +29,13 @@ 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); int insertUser(UserEntity userEntity); - IPage selectInviteUserList(Page page,String userName,String phone); + List selectInviteUserList(String userName,String phone); int selectUserOnLineCount(String qdCode); 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 85aeceec..e5d0e344 100644 --- a/src/main/java/com/sqx/modules/app/service/UserService.java +++ b/src/main/java/com/sqx/modules/app/service/UserService.java @@ -2,7 +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; @@ -215,7 +214,7 @@ public interface UserService extends IService { Double queryPayMoney(int type,String qdCode); - IPage> queryCourseOrder(Page> iPage, int type, String date,Long sysUserId); + PageUtils queryCourseOrder(Long page, Long limit, 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/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java index 344ec9de..06835b7e 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java @@ -1,9 +1,10 @@ package com.sqx.modules.app.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.app.dao.UserMoneyDetailsDao; import com.sqx.modules.app.entity.UserMoneyDetails; @@ -11,7 +12,6 @@ import com.sqx.modules.app.service.UserMoneyDetailsService; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -21,7 +21,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl page1 = new Page(page, limit); + PageHelper.startPage(page, limit); QueryWrapper queryWrapper = new QueryWrapper(); if (sysUserId != null) { queryWrapper.eq("sys_user_id", sysUserId); @@ -45,7 +45,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl(baseMapper.selectList(queryWrapper)))); } @Override diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java index b07235c6..32e4fe65 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java @@ -9,10 +9,10 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.aliyun.tea.ValidateException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -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.exception.SqxException; import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; @@ -100,8 +100,8 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl page = this.page(new Page<>(pageNum, pageSize), wrapper); - return new PageUtils(page); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(wrapper))); } @Override @@ -245,14 +245,14 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpllambdaQuery() - .eq(UserMoneyDetails::getUserId, currentUserId) + .eq(UserMoneyDetails::getUserId, currentUserId) .eq(UserMoneyDetails::getType, 1) .eq(UserMoneyDetails::getClassify, 7) .eq(UserMoneyDetails::getMoneyType, 1) .likeLeft(UserMoneyDetails::getTitle, "[连续签到") .likeRight(UserMoneyDetails::getTitle, "天]") ); - if(count > 0){ + if (count > 0) { throw new SqxException("已经领取过连续签到奖励，无需重复操作"); } BigDecimal money = new BigDecimal(moneyStr); 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 27ec86db..36e3c0f6 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 @@ -19,7 +19,6 @@ import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; 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.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.getui.push.v2.sdk.ApiHelper; @@ -34,6 +33,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.exception.SqxException; import com.sqx.common.utils.DateUtils; @@ -1358,9 +1359,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 @@ -1391,7 +1394,7 @@ public class UserServiceImpl extends ServiceImpl implements } @Override - public IPage> queryCourseOrder(Page> iPage, int type, String date, Long sysUserId) { + public PageUtils queryCourseOrder(Long page, Long limit, 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"); @@ -1403,7 +1406,12 @@ 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); + + PageHelper.startPage(page.intValue(), limit.intValue()); + List> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); + PageInfo> pageInfo = new PageInfo<>(list); + + return PageUtils.page(pageInfo, true); } @Override @@ -1484,7 +1492,8 @@ public class UserServiceImpl extends ServiceImpl implements @Override public Result selectInviteUserList(Integer page, Integer limit, String userName, String phone) { - return Result.success().put("data", baseMapper.selectInviteUserList(new Page<>(page, limit), userName, phone)); + PageHelper.startPage(page,limit); + return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectInviteUserList(userName, phone)),true)); } @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 4710d0ac..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; @@ -21,6 +19,6 @@ public interface BannerDao extends BaseMapper { // List selectList(@Param("classify") Integer classify); - IPage selectBannerPage(Page page,@Param("classify") Integer classify); + List selectBanner(@Param("classify") Integer classify); } 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 c6a4ed5f..87028667 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,13 +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; @@ -53,8 +52,8 @@ public class BannerServiceImpl extends ServiceImpl implements @Override public PageUtils selectBannerPage(Integer page, Integer limit, Integer classify) { - Page pages = new Page<>(page, limit); - return new PageUtils(bannerDao.selectBannerPage(pages, classify)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(bannerDao.selectBanner(classify))); } @Override @@ -83,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, true)); } diff --git a/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java b/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java index ed479946..fe0a2567 100644 --- a/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java +++ b/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java @@ -1,9 +1,8 @@ package com.sqx.modules.coupon.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.sqx.common.utils.Result; import com.sqx.modules.coupon.dao.CouponDao; import com.sqx.modules.coupon.entity.Coupon; @@ -34,13 +33,12 @@ public class CouponServiceImpl extends ServiceImpl implements @Override public Result selectCoupon(Integer page, Integer limit, String couponName) { - IPage pages = new Page<>(page, limit); + PageHelper.startPage(page,limit); QueryWrapper queryWrapper1 = new QueryWrapper<>(); if(couponName!=null){ queryWrapper1.eq("coupon_name",couponName); } - pages=baseMapper.selectPage(pages,queryWrapper1); - return Result.success().put("data",pages.getRecords()); + return Result.success().put("data",baseMapper.selectList(queryWrapper1)); } @Override 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..f2a3a943 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java @@ -1,18 +1,17 @@ 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.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..8672b6a2 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 courseList = baseMapper.selectCourseByCollect( userId,classify); + PageInfo pageInfo = new PageInfo<>(courseList); + 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, true)); } 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 35740842..e76e61df 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.ApiAccessLimitUtil; import com.sqx.common.utils.DateUtils; @@ -246,6 +246,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))); @@ -270,7 +272,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 daa0d227..022485e0 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 @@ -16,9 +16,15 @@ 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.*; import com.sqx.modules.app.entity.InviteAchievement; +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.service.InviteAchievementService; import com.sqx.modules.app.utils.JwtUtils; import com.sqx.modules.common.service.CommonInfoService; @@ -179,30 +185,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> map = baseMapper.selectCourse(classifyId, title, isRecommend, status, bannerId, sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); - List> records = mapIPage.getRecords(); - for (Map map : records) { - map.put("courseDetailsId", null); - map.put("courseDetailsName", ""); - map.put("dyEpisodeId", ""); - map.put("wxCourseDetailsId", ""); + PageInfo> pageInfo = new PageInfo<>(map); + List> records = pageInfo.getList(); + for (Map m : records) { + m.put("courseDetailsId", null); + m.put("courseDetailsName", ""); + m.put("dyEpisodeId", ""); + m.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> list = 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<>(list); + 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 @@ -235,8 +247,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 @@ -247,15 +261,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/integral/service/Impl/UserIntegralDetailsServiceImpl.java b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java index d0cd06b3..7b94b069 100644 --- a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java @@ -1,9 +1,10 @@ package com.sqx.modules.integral.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.app.entity.UserMoneyDetails; import com.sqx.modules.app.service.UserMoneyDetailsService; @@ -40,11 +41,12 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl page1 = userIntegralDetailsDao.selectPage(new Page<>(page, limit), new QueryWrapper().eq(userId != null, "user_id", userId).orderByDesc("create_time")); - - return page1; + public PageUtils selectUserIntegralDetailsByUserId(int page, int limit, Long userId) { + PageHelper.startPage(page,limit); + return PageUtils.page(new PageInfo<>(userIntegralDetailsDao.selectList( + new QueryWrapper() + .eq(userId != null, "user_id", userId) + .orderByDesc("create_time"))),true); } diff --git a/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java b/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java index afbcb9b3..d186cb3b 100644 --- a/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java +++ b/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java @@ -1,13 +1,13 @@ package com.sqx.modules.integral.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.integral.entity.UserIntegralDetails; public interface UserIntegralDetailsService extends IService { - IPage selectUserIntegralDetailsByUserId(int page, int limit, Long userId); + PageUtils selectUserIntegralDetailsByUserId(int page, int limit, Long userId); Result signIn(Long userId); 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 b94cf694..fdcc4024 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); @@ -28,8 +26,7 @@ public interface InviteDao extends BaseMapper { Double selectInviteSum(@Param("state") Integer state, @Param("userId") Long userId); -// IPage> selectInviteUser(Page> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType); - IPage> selectInviteUser(Page> page,@Param("code") String code); + List> selectInviteUser(@Param("code") String code); Invite selectInviteByUser(@Param("userId")Long userId,@Param("inviteeUserId") Long inviteeUserId,@Param("userType") Integer userType); @@ -41,7 +38,7 @@ public interface InviteDao extends BaseMapper { Double sumInviteMoney(@Param("time")String time,@Param("flag")Integer flag); - IPage> inviteAnalysis(Page> page,@Param("time")String time,@Param("flag")Integer flag); + List> inviteAnalysis(@Param("time")String time,@Param("flag")Integer flag); } 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 f4926807..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 @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; 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.modules.app.entity.UserEntity; @@ -61,19 +63,20 @@ 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)); } @Override public PageUtils selectInviteUser(int page, int limit, Long userId, Integer state, Integer userType) { - Page> pages = new Page<>(page, limit); UserEntity userEntity = userService.queryByUserId(userId); - return new PageUtils(inviteDao.selectInviteUser(pages, userEntity.getInvitationCode())); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(inviteDao.selectInviteUser(userEntity.getInvitationCode()))); } @Override @@ -98,8 +101,8 @@ public class InviteServiceImpl extends ServiceImpl implements @Override public PageUtils inviteAnalysis(int page, int limit, String time, Integer flag) { - Page> pages = new Page<>(page, limit); - return new PageUtils(inviteDao.inviteAnalysis(pages, time, flag)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(inviteDao.inviteAnalysis(time, flag))); } @Override 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 d81f5eca..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 @@ -1,10 +1,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.ScheduleJobLogEntity; import com.sqx.modules.job.service.ScheduleJobLogService; @@ -20,12 +22,11 @@ public class ScheduleJobLogServiceImpl extends ServiceImpl params) { String jobId = (String)params.get("jobId"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper().like(StringUtils.isNotBlank(jobId),"job_id", jobId).orderByDesc("create_time") - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper().like(StringUtils.isNotBlank(jobId),"job_id", jobId).orderByDesc("create_time")))); } } 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 1a4f6fe6..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 @@ -1,14 +1,14 @@ 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; @@ -37,12 +37,11 @@ public class ScheduleJobServiceImpl extends ServiceImpl params) { String beanName = (String)params.get("beanName"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper ().like(StringUtils.isNotBlank(beanName),"bean_name", beanName) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper ().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)))); } 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 55204d0d..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,12 +1,12 @@ 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; +import java.util.List; + /** * @author fang * @date 2020/7/9 @@ -14,11 +14,11 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface ActivityMessageInfoDao extends BaseMapper { - IPage find(Page page,@Param("state") String state); + List find(@Param("state") String state); - IPage findType(Page page,@Param("type") Integer type); + List findType(@Param("type") Integer type); - IPage findTypeByUserId(Page page,@Param("type")String type,@Param("userId") String userId); + List findTypeByUserId(@Param("type")String type,@Param("userId") String userId); Integer updateState(@Param("state") String state, @Param("id") Long id); diff --git a/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java index 1a295a77..c5c61987 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java @@ -2,6 +2,8 @@ package com.sqx.modules.message.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.modules.message.dao.ActivityMessageInfoDao; import com.sqx.modules.message.entity.ActivityMessageInfo; @@ -54,8 +56,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.find(pages,state)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.find(state))); } @Override @@ -67,8 +69,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.findType(pages,type)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.findType(type))); } @Override @@ -85,8 +87,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.findTypeByUserId(pages,type,userId)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.findTypeByUserId(type,userId))); } 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 38152573..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 @@ -1,10 +1,12 @@ 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.message.dao.MessageInfoDao; import com.sqx.modules.message.entity.MessageInfo; @@ -38,20 +40,22 @@ public class MessageServiceImpl extends ServiceImpl Long userId = (Long)params.get("userId"); Integer state = (Integer)params.get("state"); Integer type = (Integer)params.get("type"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .eq(userId!=null,"user_id", userId) - .eq(state!=null,"state", state) - .eq(type!=null,"type", type).orderByDesc("create_at") - ); - List records = page.getRecords(); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + PageUtils page = PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() + .eq(userId != null, "user_id", userId) + .eq(state != null, "state", state) + .eq(type != null, "type", type).orderByDesc("create_at")))); + + List records = (List) page.getList(); for (MessageInfo messageInfo:records){ if(messageInfo.getUserId()!=null){ messageInfo.setUserEntity(userService.selectUserById(Long.parseLong(messageInfo.getUserId()))); } } - return new PageUtils(page); + return page; } @Override 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..8a11fd1f 100644 --- a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java @@ -1,12 +1,12 @@ package com.sqx.modules.orders.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.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 +14,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); @@ -26,7 +26,7 @@ public interface OrdersDao extends BaseMapper { Orders selectOrdersByCourseIdAndUserId(Long userId, Long courseId); - IPage selectOrdersMoneyList(Page page, Integer flag, String time); + List selectOrdersMoneyList(Integer flag, String time); Integer selectOrdersCount(Integer status, Integer ordersType, Integer flag, String time, Long sysUserId); 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..2c5d07b1 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 @@ -8,10 +8,10 @@ import com.alibaba.fastjson.JSON; 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.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,28 +657,32 @@ 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 public Result selectOrderByUserId(Integer page, Integer limit, Long userId) { - IPage orderPage = new Page<>(page, limit); + PageHelper.startPage(page, limit); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); queryWrapper.eq("orders_type", 1); queryWrapper.eq("status", 1); queryWrapper.orderByDesc("create_time"); - IPage iPage = baseMapper.selectPage(orderPage, queryWrapper); - List bean = iPage.getRecords(); + List list = baseMapper.selectList(queryWrapper); + PageInfo pageInfo = new PageInfo<>(list); + List bean = pageInfo.getList(); if (bean != null && bean.size() > 0) { for (int i = 0; bean.size() > i; i++) { bean.get(i).setCourse(courseDao.selectById(bean.get(i).getCourseId())); } } - return Result.success().put("data", iPage); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } @Override @@ -711,7 +715,8 @@ public class OrdersServiceImpl extends ServiceImpl implements @Override public Result selectOrdersMoneyList(Integer page, Integer limit, Integer flag, String time) { - return Result.success().put("data", baseMapper.selectOrdersMoneyList(new Page<>(page, limit), flag, time)); + PageHelper.startPage(page,limit); + return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectOrdersMoneyList( flag, time)),true)); } 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 0d6bf835..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,9 +1,11 @@ package com.sqx.modules.oss.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; +import cn.hutool.core.map.MapProxy; 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.oss.dao.SysOssDao; import com.sqx.modules.oss.entity.SysOssEntity; import com.sqx.modules.oss.service.SysOssService; @@ -17,11 +19,11 @@ public class SysOssServiceImpl extends ServiceImpl impl @Override public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + 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 157eaa95..c2909943 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 @@ -42,7 +38,7 @@ public interface CashOutDao extends BaseMapper { Double selectMayMoney(@Param("userId") Long userId); - IPage selectCashOutPage(Page page, CashOut cashOut,@Param("isApp") boolean isApp); + List selectCashOutPage(CashOut cashOut,@Param("isApp") boolean isApp); List selectCashOutList(@Param("cashOut") CashOut cashOut); 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 830246fc..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; @@ -29,19 +27,19 @@ public interface PayDetailsDao extends BaseMapper { int updateState(@Param("id") Long id, @Param("state") Integer state, @Param("time") String time, @Param("tradeNo") String tradeNo,@Param("thirdOrderNo") String thirdOrderNo); - IPage> selectPayDetails(@Param("page") Page> page, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId); + List> selectPayDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId); Double selectSumPay(@Param("createTime") String createTime, @Param("endTime") String endTime, @Param("userId") Long userId); Double selectSumMember(@Param("time") String time, @Param("flag") Integer flag); - IPage> payMemberAnalysis(Page> page, @Param("time") String time, @Param("flag") Integer flag); + List> payMemberAnalysis(@Param("time") String time, @Param("flag") Integer flag); Double selectSumPayByState(@Param("time") String time, @Param("flag") Integer flag, @Param("state") Integer state); 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/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index d24d4fb9..b38e1c52 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -4,17 +4,15 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapProxy; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.NumberUtil; 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.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.Constant; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.dao.MsgDao; @@ -40,6 +38,7 @@ import com.sqx.modules.sys.entity.SysUserEntity; import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.AliPayOrderUtil; import com.sqx.modules.utils.AmountCalUtils; +import com.sqx.modules.utils.ParamPageUtils; import com.sqx.modules.utils.excel.ExcelData; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -106,8 +105,9 @@ public class CashOutServiceImpl extends ServiceImpl impleme } @Override - public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut, boolean isApp) { - return new PageUtils(baseMapper.selectCashOutPage(new Page<>(page, limit), cashOut, isApp)); + public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut) { + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut))); } @@ -545,13 +545,11 @@ public class CashOutServiceImpl extends ServiceImpl impleme @Override public PageUtils auditPage(Map params) { - MapProxy proxy = MapProxy.create(params); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); CashOut cashOut = BeanUtil.toBean(params, CashOut.class); - //cashOut.setState(3); - long pageNum = proxy.getLong(Constant.PAGE, 1L); - long pageSize = proxy.getLong(Constant.LIMIT, 10L); - IPage page = baseMapper.selectCashOutPage(new Page<>(pageNum, pageSize), cashOut, false); - return new PageUtils(page); + List page = baseMapper.selectCashOutPage(cashOut, false); + PageInfo pageInfo = new PageInfo<>(page); + return PageUtils.page(pageInfo); } @Override @@ -627,7 +625,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme baseMapper.updateById(entity); UserMoneyDetails userMoneyDetails = new UserMoneyDetails( entity.getUserId(), entity.getSysUserId(), null, "[提现退款]", 4, 1, 2, - new BigDecimal(entity.getMoney()), "提现失败，自动退款" + entity.getMoney() + "元", 1,entity.getId()); + new BigDecimal(entity.getMoney()), "提现失败，自动退款" + entity.getMoney() + "元", 1, entity.getId()); userMoneyDetailsService.save(userMoneyDetails); //归还余额 钱 userMoneyService.updateAmount(1, entity.getUserId(), Convert.toDouble(entity.getMoney())); @@ -672,7 +670,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme @Override public Map alipayTransferSummaryQuery(String alipayAccountName) { - if(StrUtil.isBlank(alipayAccountName)){ + if (StrUtil.isBlank(alipayAccountName)) { throw new SqxException("支付宝账号不能为空！"); } BigDecimal sum = BigDecimal.ZERO; 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 47d120f9..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 @@ -2,6 +2,8 @@ package com.sqx.modules.pay.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.modules.pay.dao.PayDetailsDao; import com.sqx.modules.pay.entity.PayDetails; @@ -10,6 +12,7 @@ import com.sqx.modules.utils.TimeCompleteUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -27,11 +30,13 @@ public class PayDetailsServiceImpl extends ServiceImpl> pages = new Page<>(page, limit); + PageHelper.startPage(page, limit); if (state != null && state == -1) { state = null; } - return new PageUtils(payDetailsDao.selectPayDetails(pages, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state,userName,orderId)); + List> payDetails = payDetailsDao.selectPayDetails(TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state, userName, orderId); + PageInfo> pageInfo = new PageInfo<>(payDetails); + return PageUtils.page(pageInfo); } @Override @@ -44,14 +49,18 @@ public class PayDetailsServiceImpl extends ServiceImpl> pages = new Page<>(page, limit); - return new PageUtils(payDetailsDao.payMemberAnalysis(pages, time, flag)); + PageHelper.startPage(page, limit); + List> list = payDetailsDao.payMemberAnalysis(time, flag); + PageInfo> pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo); } @Override public PageUtils selectUserMemberList(int page, int limit, String phone) { - Page> 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 @@ -65,8 +74,8 @@ public class PayDetailsServiceImpl extends ServiceImpl { - 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/SdkTypeService.java b/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java index 850f1c6a..ba00b591 100644 --- a/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java +++ b/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.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.SdkType; @@ -17,5 +17,5 @@ public interface SdkTypeService extends IService { Result saveSdkType(SdkType sdkType); - IPage getSdkTypeList(Integer page, Integer limit, SdkType sdkType); + PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType); } 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..7f1c4280 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), true); } @Override diff --git a/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java b/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java index 4ba6869e..0eada177 100644 --- a/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java +++ b/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.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.sdk.dao.SdkTypeDao; import com.sqx.modules.sdk.entity.SdkType; @@ -39,15 +40,14 @@ public class SdkTypeServiceImpl extends ServiceImpl impleme } @Override - public IPage getSdkTypeList(Integer page, Integer limit, SdkType sdkType) { - Page pages; - if (page != null && limit != null) { - pages = new Page<>(page, limit); - } else { - pages = new Page<>(); - pages.setSize(-1); + public PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType) { + + if (page == null || limit == null) { + page = 1; + limit = 10; } - return baseMapper.selectPage(pages, new QueryWrapper<>(sdkType).orderByDesc("create_time")); + PageHelper.startPage(page,limit); + return PageUtils.page(new PageInfo<>(baseMapper.selectList(new QueryWrapper<>(sdkType).orderByDesc("create_time"))),true); } 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/sys/controller/SysConfigController.java b/src/main/java/com/sqx/modules/sys/controller/SysConfigController.java index 5fe42ad2..0fa140c4 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysConfigController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysConfigController.java @@ -1,16 +1,20 @@ package com.sqx.modules.sys.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.annotation.SysLog; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.common.validator.ValidatorUtils; import com.sqx.modules.sys.entity.SysConfigEntity; import com.sqx.modules.sys.service.SysConfigService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -29,9 +33,10 @@ public class SysConfigController extends AbstractController { @GetMapping("/list") @RequiresPermissions("sys:config:list") public Result list(@RequestParam Map params){ - PageUtils page = sysConfigService.queryPage(params); - - return Result.success().put("page", page); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List list = sysConfigService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("page", PageUtils.page(pageInfo)); } diff --git a/src/main/java/com/sqx/modules/sys/controller/SysDictController.java b/src/main/java/com/sqx/modules/sys/controller/SysDictController.java index 5f2213ed..a537a946 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysDictController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysDictController.java @@ -1,20 +1,23 @@ package com.sqx.modules.sys.controller; +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.common.validator.ValidatorUtils; import com.sqx.modules.sys.entity.SysDictEntity; import com.sqx.modules.sys.service.SysDictService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.List; import java.util.Map; /** * 数据字典 - * */ @RestController @RequestMapping("sys/dict") @@ -27,10 +30,12 @@ public class SysDictController { */ @RequestMapping("/list") @RequiresPermissions("sys:dict:list") - public Result list(@RequestParam Map params){ - PageUtils page = sysDictService.queryPage(params); + public Result list(@RequestParam Map params) { + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List list = sysDictService.list(); + PageInfo pageInfo = new PageInfo<>(list); - return Result.success().put("page", page); + return Result.success().put("page", PageUtils.page(pageInfo)); } @@ -39,7 +44,7 @@ public class SysDictController { */ @RequestMapping("/info/{id}") @RequiresPermissions("sys:dict:info") - public Result info(@PathVariable("id") Long id){ + public Result info(@PathVariable("id") Long id) { SysDictEntity dict = sysDictService.getById(id); return Result.success().put("dict", dict); @@ -50,7 +55,7 @@ public class SysDictController { */ @RequestMapping("/save") @RequiresPermissions("sys:dict:save") - public Result save(@RequestBody SysDictEntity dict){ + public Result save(@RequestBody SysDictEntity dict) { //校验类型 ValidatorUtils.validateEntity(dict); @@ -64,7 +69,7 @@ public class SysDictController { */ @RequestMapping("/update") @RequiresPermissions("sys:dict:update") - public Result update(@RequestBody SysDictEntity dict){ + public Result update(@RequestBody SysDictEntity dict) { //校验类型 ValidatorUtils.validateEntity(dict); @@ -78,7 +83,7 @@ public class SysDictController { */ @RequestMapping("/delete") @RequiresPermissions("sys:dict:delete") - public Result delete(@RequestBody Long[] ids){ + public Result delete(@RequestBody Long[] ids) { sysDictService.removeByIds(Arrays.asList(ids)); return Result.success(); diff --git a/src/main/java/com/sqx/modules/sys/controller/SysLogController.java b/src/main/java/com/sqx/modules/sys/controller/SysLogController.java index d7a08df1..55b3c92f 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysLogController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysLogController.java @@ -1,8 +1,12 @@ package com.sqx.modules.sys.controller; +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.sys.entity.SysLogEntity; import com.sqx.modules.sys.service.SysLogService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -11,29 +15,31 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; /** * 系统日志 - * */ @Controller @RequestMapping("/sys/log") public class SysLogController { - @Autowired - private SysLogService sysLogService; - - /** - * 列表 - */ - @ResponseBody - @GetMapping("/list") - @RequiresPermissions("sys:log:list") - public Result list(@RequestParam Map params){ - PageUtils page = sysLogService.queryPage(params); + @Autowired + private SysLogService sysLogService; + + /** + * 列表 + */ + @ResponseBody + @GetMapping("/list") + @RequiresPermissions("sys:log:list") + public Result list(@RequestParam Map params) { + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List entities = sysLogService.list(); + PageInfo pageInfo = new PageInfo<>(entities); + + return Result.success().put("page", PageUtils.page(pageInfo)); + } - return Result.success().put("page", page); - } - } diff --git a/src/main/java/com/sqx/modules/sys/controller/SysRoleController.java b/src/main/java/com/sqx/modules/sys/controller/SysRoleController.java index 88db4656..8c423a23 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysRoleController.java @@ -1,5 +1,7 @@ package com.sqx.modules.sys.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.annotation.SysLog; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -7,6 +9,7 @@ import com.sqx.common.validator.ValidatorUtils; import com.sqx.modules.sys.entity.SysRoleEntity; import com.sqx.modules.sys.service.SysRoleMenuService; import com.sqx.modules.sys.service.SysRoleService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,101 +20,102 @@ import java.util.Map; /** * 角色管理 - * */ @RestController @RequestMapping("/sys/role") public class SysRoleController extends AbstractController { - @Autowired - private SysRoleService sysRoleService; - @Autowired - private SysRoleMenuService sysRoleMenuService; + @Autowired + private SysRoleService sysRoleService; + @Autowired + private SysRoleMenuService sysRoleMenuService; - /** - * 角色列表 - */ - @GetMapping("/list") - @RequiresPermissions("sys:role:list") - public Result list(@RequestParam Map params){ - //如果不是超级管理员，则只查询自己创建的角色列表 + /** + * 角色列表 + */ + @GetMapping("/list") + @RequiresPermissions("sys:role:list") + public Result list(@RequestParam Map params) { + //如果不是超级管理员，则只查询自己创建的角色列表 /*if(getUserId() != Constant.SUPER_ADMIN){ params.put("createUserId", getUserId()); }*/ - PageUtils page = sysRoleService.queryPage(params); - return Result.success().put("page", page); - } + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List list = sysRoleService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("page", PageUtils.page(pageInfo)); + } - /** - * 角色列表 - */ - @GetMapping("/select") - @RequiresPermissions("sys:role:select") - public Result select(){ - Map map = new HashMap<>(); + /** + * 角色列表 + */ + @GetMapping("/select") + @RequiresPermissions("sys:role:select") + public Result select() { + Map map = new HashMap<>(); - //如果不是超级管理员，则只查询自己所拥有的角色列表 + //如果不是超级管理员，则只查询自己所拥有的角色列表 /*if(getUserId() != Constant.SUPER_ADMIN){ map.put("create_user_id", getUserId()); }*/ - List list = (List) sysRoleService.listByMap(map); + List list = (List) sysRoleService.listByMap(map); - return Result.success().put("list", list); - } + return Result.success().put("list", list); + } - /** - * 角色信息 - */ - @GetMapping("/info/{roleId}") - @RequiresPermissions("sys:role:info") - public Result info(@PathVariable("roleId") Long roleId){ - SysRoleEntity role = sysRoleService.getById(roleId); + /** + * 角色信息 + */ + @GetMapping("/info/{roleId}") + @RequiresPermissions("sys:role:info") + public Result info(@PathVariable("roleId") Long roleId) { + SysRoleEntity role = sysRoleService.getById(roleId); - //查询角色对应的菜单 - List menuIdList = sysRoleMenuService.queryMenuIdList(roleId); - role.setMenuIdList(menuIdList); + //查询角色对应的菜单 + List menuIdList = sysRoleMenuService.queryMenuIdList(roleId); + role.setMenuIdList(menuIdList); - return Result.success().put("role", role); - } + return Result.success().put("role", role); + } - /** - * 保存角色 - */ - @SysLog("保存角色") - @PostMapping("/save") - @RequiresPermissions("sys:role:save") - public Result save(@RequestBody SysRoleEntity role){ - ValidatorUtils.validateEntity(role); + /** + * 保存角色 + */ + @SysLog("保存角色") + @PostMapping("/save") + @RequiresPermissions("sys:role:save") + public Result save(@RequestBody SysRoleEntity role) { + ValidatorUtils.validateEntity(role); - role.setCreateUserId(getUserId()); - sysRoleService.saveRole(role); + role.setCreateUserId(getUserId()); + sysRoleService.saveRole(role); - return Result.success(); - } + return Result.success(); + } - /** - * 修改角色 - */ - @SysLog("修改角色") - @PostMapping("/update") - @RequiresPermissions("sys:role:update") - public Result update(@RequestBody SysRoleEntity role){ - ValidatorUtils.validateEntity(role); + /** + * 修改角色 + */ + @SysLog("修改角色") + @PostMapping("/update") + @RequiresPermissions("sys:role:update") + public Result update(@RequestBody SysRoleEntity role) { + ValidatorUtils.validateEntity(role); - role.setCreateUserId(getUserId()); - sysRoleService.update(role); + role.setCreateUserId(getUserId()); + sysRoleService.update(role); - return Result.success(); - } + return Result.success(); + } - /** - * 删除角色 - */ - @SysLog("删除角色") - @PostMapping("/delete") - @RequiresPermissions("sys:role:delete") - public Result delete(@RequestBody Long[] roleIds){ - sysRoleService.deleteBatch(roleIds); + /** + * 删除角色 + */ + @SysLog("删除角色") + @PostMapping("/delete") + @RequiresPermissions("sys:role:delete") + public Result delete(@RequestBody Long[] roleIds) { + sysRoleService.deleteBatch(roleIds); - return Result.success(); - } + return Result.success(); + } } diff --git a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java index 06ee5c18..9263ccba 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java @@ -1,5 +1,7 @@ package com.sqx.modules.sys.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.annotation.SysLog; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -11,6 +13,7 @@ import com.sqx.modules.sys.entity.SysUserEntity; import com.sqx.modules.sys.form.PasswordForm; import com.sqx.modules.sys.service.SysUserRoleService; import com.sqx.modules.sys.service.SysUserService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.shiro.crypto.hash.Sha256Hash; import org.springframework.beans.factory.annotation.Autowired; @@ -41,11 +44,12 @@ public class SysUserController extends AbstractController { /*if(getUserId() != Constant.SUPER_ADMIN){ params.put("createUserId", getUserId()); }*/ - PageUtils page = sysUserService.queryPage(params); - - return Result.success().put("page", page); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List list = sysUserService.list(); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("page", PageUtils.page(pageInfo)); } - + /** * 获取登录的用户信息 */ @@ -53,42 +57,42 @@ public class SysUserController extends AbstractController { public Result info(){ return Result.success().put("user", getUser()); } - + /** * 修改登录用户密码 */ @SysLog("修改密码") public Result password(@RequestBody PasswordForm form){ Assert.isBlank(form.getNewPassword(), "新密码不为能空"); - + //sha256加密 String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex(); //sha256加密 String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex(); - + //更新密码 boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword); if(!flag){ return Result.error("原密码不正确"); } - + return Result.success(); } - + /** * 用户信息 */ @GetMapping("/info/{userId}") public Result info(@PathVariable("userId") Long userId){ SysUserEntity user = sysUserService.getById(userId); - + //获取用户所属的角色列表 List roleIdList = sysUserRoleService.queryRoleIdList(userId); user.setRoleIdList(roleIdList); - + return Result.success().put("user", user); } - + /** * 保存用户 */ @@ -96,13 +100,13 @@ public class SysUserController extends AbstractController { @PostMapping("/save") public Result save(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, AddGroup.class); - + user.setCreateUserId(getUserId()); sysUserService.saveUser(user); - + return Result.success(); } - + /** * 修改用户 */ @@ -113,10 +117,10 @@ public class SysUserController extends AbstractController { user.setCreateUserId(getUserId()); sysUserService.update(user); - + return Result.success(); } - + /** * 删除用户 */ @@ -126,13 +130,13 @@ public class SysUserController extends AbstractController { if(ArrayUtils.contains(userIds, 1L)){ return Result.error("系统管理员不能删除"); } - + if(ArrayUtils.contains(userIds, getUserId())){ return Result.error("当前用户不能删除"); } - + sysUserService.deleteBatch(userIds); - + return Result.success(); } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java index 4a694eaf..a23610f5 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java @@ -1,96 +1,97 @@ package com.sqx.modules.sys.service.impl; 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.google.gson.Gson; import com.sqx.common.exception.SqxException; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.sys.dao.SysConfigDao; import com.sqx.modules.sys.entity.SysConfigEntity; import com.sqx.modules.sys.redis.SysConfigRedis; import com.sqx.modules.sys.service.SysConfigService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.List; import java.util.Map; @Service("sysConfigService") public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { - @Autowired - private SysConfigRedis sysConfigRedis; + @Autowired + private SysConfigRedis sysConfigRedis; - @Override - public PageUtils queryPage(Map params) { - String paramKey = (String)params.get("paramKey"); + @Override + public PageUtils queryPage(Map params) { + String paramKey = (String) params.get("paramKey"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(paramKey),"param_key", paramKey) - .eq("status", 1) - ); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List entityList = baseMapper.selectList(new QueryWrapper() + .like(StringUtils.isNotBlank(paramKey), "param_key", paramKey) + .eq("status", 1) + ); + PageInfo pageInfo = new PageInfo<>(entityList); + return PageUtils.page(pageInfo); + } - return new PageUtils(page); - } + @Override + public void saveConfig(SysConfigEntity config) { + this.save(config); + sysConfigRedis.saveOrUpdate(config); + } - @Override - public void saveConfig(SysConfigEntity config) { - this.save(config); - sysConfigRedis.saveOrUpdate(config); - } + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SysConfigEntity config) { + this.updateById(config); + sysConfigRedis.saveOrUpdate(config); + } - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SysConfigEntity config) { - this.updateById(config); - sysConfigRedis.saveOrUpdate(config); - } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateValueByKey(String key, String value) { + baseMapper.updateValueByKey(key, value); + sysConfigRedis.delete(key); + } - @Override - @Transactional(rollbackFor = Exception.class) - public void updateValueByKey(String key, String value) { - baseMapper.updateValueByKey(key, value); - sysConfigRedis.delete(key); - } + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteBatch(Long[] ids) { + for (Long id : ids) { + SysConfigEntity config = this.getById(id); + sysConfigRedis.delete(config.getParamKey()); + } - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteBatch(Long[] ids) { - for(Long id : ids){ - SysConfigEntity config = this.getById(id); - sysConfigRedis.delete(config.getParamKey()); - } + this.removeByIds(Arrays.asList(ids)); + } - this.removeByIds(Arrays.asList(ids)); - } + @Override + public String getValue(String key) { + SysConfigEntity config = sysConfigRedis.get(key); + if (config == null) { + config = baseMapper.queryByKey(key); + sysConfigRedis.saveOrUpdate(config); + } - @Override - public String getValue(String key) { - SysConfigEntity config = sysConfigRedis.get(key); - if(config == null){ - config = baseMapper.queryByKey(key); - sysConfigRedis.saveOrUpdate(config); - } + return config == null ? null : config.getParamValue(); + } - return config == null ? null : config.getParamValue(); - } - - @Override - public T getConfigObject(String key, Class clazz) { - String value = getValue(key); - if(StringUtils.isNotBlank(value)){ - return new Gson().fromJson(value, clazz); - } + @Override + public T getConfigObject(String key, Class clazz) { + String value = getValue(key); + if (StringUtils.isNotBlank(value)) { + return new Gson().fromJson(value, clazz); + } - try { - return clazz.newInstance(); - } catch (Exception e) { - throw new SqxException("获取参数失败"); - } - } + try { + return clazz.newInstance(); + } catch (Exception e) { + throw new SqxException("获取参数失败"); + } + } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java index 15cf3464..a6f3b527 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java @@ -1,16 +1,18 @@ package com.sqx.modules.sys.service.impl; 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.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.sys.dao.SysDictDao; import com.sqx.modules.sys.entity.SysDictEntity; import com.sqx.modules.sys.service.SysDictService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @@ -19,15 +21,14 @@ public class SysDictServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { - String name = (String)params.get("name"); + String name = (String) params.get("name"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(name),"name", name) + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List entityList = baseMapper.selectList(new QueryWrapper() + .like(StringUtils.isNotBlank(name), "name", name) ); - - return new PageUtils(page); + PageInfo pageInfo = new PageInfo<>(entityList); + return PageUtils.page(pageInfo); } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java index fe77587e..96240245 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java @@ -1,16 +1,18 @@ package com.sqx.modules.sys.service.impl; 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.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.sys.dao.SysLogDao; import com.sqx.modules.sys.entity.SysLogEntity; import com.sqx.modules.sys.service.SysLogService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @@ -19,13 +21,11 @@ public class SysLogServiceImpl extends ServiceImpl impl @Override public PageUtils queryPage(Map params) { - String key = (String)params.get("key"); + String key = (String) params.get("key"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper().like(StringUtils.isNotBlank(key),"username", key) - ); - - return new PageUtils(page); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List list = baseMapper.selectList(new QueryWrapper().like(StringUtils.isNotBlank(key), "username", key)); + PageInfo pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo); } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java index 74169715..ad8e347e 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,16 +1,16 @@ package com.sqx.modules.sys.service.impl; 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.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.sys.dao.SysRoleDao; import com.sqx.modules.sys.entity.SysRoleEntity; import com.sqx.modules.sys.service.SysRoleMenuService; import com.sqx.modules.sys.service.SysRoleService; import com.sqx.modules.sys.service.SysUserRoleService; -import com.sqx.modules.sys.service.SysUserService; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,8 +29,6 @@ import java.util.Map; public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @Autowired private SysRoleMenuService sysRoleMenuService; - @Autowired - private SysUserService sysUserService; @Autowired private SysUserRoleService sysUserRoleService; @@ -39,14 +37,12 @@ public class SysRoleServiceImpl extends ServiceImpl i String roleName = (String)params.get("roleName"); Long createUserId = (Long)params.get("createUserId"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(roleName),"role_name", roleName) - .eq(createUserId != null,"create_user_id", createUserId) - ); - - return new PageUtils(page); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List sysRoleEntities = baseMapper.selectList(new QueryWrapper() + .like(StringUtils.isNotBlank(roleName), "role_name", roleName) + .eq(createUserId != null, "create_user_id", createUserId)); + PageInfo pageInfo = new PageInfo<>(sysRoleEntities); + return PageUtils.page(pageInfo); } @Override @@ -101,10 +97,10 @@ public class SysRoleServiceImpl extends ServiceImpl i if(role.getCreateUserId() == Constant.SUPER_ADMIN){ return ; } - + //查询用户所拥有的菜单列表 List menuIdList = sysUserService.queryAllMenuId(role.getCreateUserId()); - + //判断是否越权 if(!menuIdList.containsAll(role.getMenuIdList())){ throw new SqxException("新增角色的权限，已超出你的权限范围"); diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java index a0b0c868..284c3410 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,16 +1,17 @@ package com.sqx.modules.sys.service.impl; 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.PageUtils; -import com.sqx.common.utils.Query; import com.sqx.modules.sys.dao.SysUserDao; import com.sqx.modules.sys.entity.SysUserEntity; import com.sqx.modules.sys.service.SysRoleService; import com.sqx.modules.sys.service.SysUserRoleService; import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.InvitationCodeUtil; +import com.sqx.modules.utils.ParamPageUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.crypto.hash.Sha256Hash; @@ -41,18 +42,16 @@ public class SysUserServiceImpl extends ServiceImpl i Long createUserId = (Long) params.get("createUserId"); Object isChannel = params.get("isChannel"); Object sysUserId = params.get("sysUserId"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(username), "username", username) - .eq(createUserId != null, "create_user_id", createUserId) - .eq(isChannel != null, "is_channel", isChannel) - .eq(sysUserId != null, "sys_user_id", sysUserId) - .isNull(sysUserId == null, "sys_user_id") - .isNull(isChannel == null, "is_channel") - ); - - return new PageUtils(page); + PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params)); + List sysUserEntities = baseMapper.selectList(new QueryWrapper() + .like(StringUtils.isNotBlank(username), "username", username) + .eq(createUserId != null, "create_user_id", createUserId) + .eq(isChannel != null, "is_channel", isChannel) + .eq(sysUserId != null, "sys_user_id", sysUserId) + .isNull(sysUserId == null, "sys_user_id") + .isNull(isChannel == null, "is_channel")); + PageInfo pageInfo = new PageInfo<>(sysUserEntities); + return PageUtils.page(pageInfo); } @Override @@ -132,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl i if(user.getCreateUserId() == Constant.SUPER_ADMIN){ return ; } - + //查询用户创建的角色列表 List roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId()); @@ -147,4 +146,4 @@ public class SysUserServiceImpl extends ServiceImpl i return baseMapper.selectOne(new QueryWrapper().isNull("sys_user_id").eq("qd_code", qdCode)); } -} \ No newline at end of file +} 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/java/com/sqx/modules/urlAddress/controller/UrlAddressController.java b/src/main/java/com/sqx/modules/urlAddress/controller/UrlAddressController.java index d0eeeb61..a48cb016 100644 --- a/src/main/java/com/sqx/modules/urlAddress/controller/UrlAddressController.java +++ b/src/main/java/com/sqx/modules/urlAddress/controller/UrlAddressController.java @@ -2,6 +2,8 @@ package com.sqx.modules.urlAddress.controller; 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.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; @RestController @Api(value = "域名池", tags = {"域名池"}) @@ -49,9 +52,11 @@ public class UrlAddressController extends AbstractController { @GetMapping("/selectUrlAddressList") @ApiOperation("查询域名池列表") public Result selectUrlAddressList(Integer page,Integer limit,String urlAddress,Integer status){ - return Result.success().put("data",new PageUtils(urlAddressService.page(new Page<>(page,limit), - new QueryWrapper().like(StringUtils.isNotEmpty(urlAddress),"url_address",urlAddress) - .eq(status!=null && status!=0,"status",status)))); + PageHelper.startPage(page,limit); + List list = urlAddressService.list(new QueryWrapper().like(StringUtils.isNotEmpty(urlAddress), "url_address", urlAddress) + .eq(status != null && status != 0, "status", status)); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo)); } @GetMapping("/selectUrlAddress") diff --git a/src/main/java/com/sqx/modules/utils/ParamPageUtils.java b/src/main/java/com/sqx/modules/utils/ParamPageUtils.java new file mode 100644 index 00000000..68e3a65e --- /dev/null +++ b/src/main/java/com/sqx/modules/utils/ParamPageUtils.java @@ -0,0 +1,24 @@ +package com.sqx.modules.utils; + +import java.util.Map; + +/** + * @author GYJoker + */ +public class ParamPageUtils { + public static int getPageNum(Map params) { + Object page = params.get("page"); + if (page == null) { + return 1; + } + return Integer.parseInt(page.toString()); + } + + public static int getPageSize(Map params) { + Object limit = params.get("limit"); + if (limit == null) { + return 10; + } + return Integer.parseInt(limit.toString()); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index cdee1a59..20850d41 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -21,9 +21,10 @@ connection-timeout: 30000 spring: # sharding-jdbc 配置 shardingsphere: - center-tables-data-node: duanju.%s # 显示sharding-jdbc改写的sql语句 show-sql: false + + center-tables-data-node: duanju.%s # 数据源名称 datasource: # 数据源配置begin diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0ab4e7de..95687182 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ swagger: - enabled: true + enabled: false pay: - h5BaseUrl: https://video-h5.hnsiyao.cn/me/detail/detail?allId= - orderNotifyUrl: https://video.hnsiyao.cn/czg/app/wuyou/notify - extractNotifyUrl: https://video.hnsiyao.cn/czg/app/wuyou/extractNotify + h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId= + orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify + extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify # 数据源的一些配置 driver-class-name: com.mysql.cj.jdbc.Driver @@ -22,14 +22,24 @@ spring: # sharding-jdbc 配置 shardingsphere: center-tables-data-node: duanju.%s + # 区域表的数据源节点 + region-tables-data-node: duanju-$->{0..4}.%s + # 区域分库策略的计算字段 + region-tables-sharding-database-column: user_id + # 分库的计算方法 + region-tables-sharding-database-algorithm: duanju-$->{Math.abs(user_id) % 5} + + # 短剧集表 拆分 + course_details-sharding-database-column: course_id + course_details-sharding-database-algorithm: duanju-$->{Math.abs(course_id) % 5} + # 显示sharding-jdbc改写的sql语句 show-sql: false # 数据源名称 datasource: - # 数据源配置begin - master-0: + master: driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://rm-gc712o11yndj78x6a6o.mysql.cn-chengdu.rds.aliyuncs.com/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + jdbc-url: jdbc:mysql://rm-gc7xx913734hv5w5q.mysql.cn-chengdu.rds.aliyuncs.com/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT username: video_user password: VideoUser@1 minimum-idle: ${minimum-idle} @@ -37,11 +47,112 @@ spring: idle-timeout: ${idle-timeout} max-lifetime: ${max-lifetime} connection-timeout: ${connection-timeout} + # 数据源配置begin + master-0: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + master-1: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + master-2: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + master-3: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + master-4: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + slave: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} slave-0: driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + slave-1: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + slave-2: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + slave-3: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + slave-4: + driver-class-name: ${driver-class-name} + jdbc-url: + username: + password: minimum-idle: ${minimum-idle} maximum-pool-size: ${maximum-pool-size} idle-timeout: ${idle-timeout} @@ -53,6 +164,21 @@ spring: master-slave-rules: #数据源 duanju: + master-data-source-name: master + slave-data-source-names: slave + duanju-0: master-data-source-name: master-0 - slave-data-source-names: - - slave-0 \ No newline at end of file + slave-data-source-names: slave-0 + duanju-1: + master-data-source-name: master-1 + slave-data-source-names: slave-1 + duanju-2: + master-data-source-name: master-2 + slave-data-source-names: slave-2 + duanju-3: + master-data-source-name: master-3 + slave-data-source-names: slave-3 + duanju-4: + master-data-source-name: master-4 + slave-data-source-names: slave-4 + diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3842933f..ba9a00c5 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,9 +1,9 @@ swagger: - enabled: false + enabled: false pay: - h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId= - orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify - extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify + h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId= + orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify + extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify # 数据源的一些配置 driver-class-name: com.mysql.cj.jdbc.Driver @@ -19,63 +19,173 @@ max-lifetime: 30000 connection-timeout: 30000 spring: - # sharding-jdbc 配置 - shardingsphere: - center-tables-data-node: duanju.%s - # 显示sharding-jdbc改写的sql语句 - show-sql: false - # 数据源名称 - datasource: - # 数据源配置begin - master-0: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://rm-gc7xx913734hv5w5q.mysql.cn-chengdu.rds.aliyuncs.com/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: video_user - password: VideoUser@1 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} -# slave-0: -# driver-class-name: ${driver-class-name} -# jdbc-url: jdbc:mysql://localhost:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT -# username: root -# password: acddb0c84a192ada -# minimum-idle: ${minimum-idle} -# maximum-pool-size: ${maximum-pool-size} -# idle-timeout: ${idle-timeout} -# max-lifetime: ${max-lifetime} -# connection-timeout: ${connection-timeout} -# slave-1: -# driver-class-name: ${driver-class-name} -# jdbc-url: jdbc:mysql://172.18.96.9:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT -# username: root -# password: VideoUser1@ -# minimum-idle: ${minimum-idle} -# maximum-pool-size: ${maximum-pool-size} -# idle-timeout: ${idle-timeout} -# max-lifetime: ${max-lifetime} -# connection-timeout: ${connection-timeout} - slave-2: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://172.18.96.8:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: VideoUser1@ - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - # 数据源配置end + # sharding-jdbc 配置 + shardingsphere: + # 显示sharding-jdbc改写的sql语句 + show-sql: true + + center-tables-data-node: duanju.%s + # 区域表的数据源节点 + region-tables-data-node: duanju-$->{0..4}.%s + # 区域分库策略的计算字段 + region-tables-sharding-database-column: user_id + # 分库的计算方法 + region-tables-sharding-database-algorithm: duanju-$->{user_id % 5} + + # 短剧集表 拆分 + course_details-sharding-database-column: course_id + course_details-sharding-database-algorithm: duanju-$->{course_id % 5} + # 数据源名称 + datasource: + duanju: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + # 数据源配置begin + duanju-0: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-1: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-2: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-3: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-4: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + + duanju-slave: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-slave-0: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-slave-1: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-slave-2: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-slave-3: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + duanju-slave-4: + driver-class-name: ${driver-class-name} + jdbc-url: jdbc:mysql://192.168.1.41:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: gongyijieqp002 + minimum-idle: ${minimum-idle} + maximum-pool-size: ${maximum-pool-size} + idle-timeout: ${idle-timeout} + max-lifetime: ${max-lifetime} + connection-timeout: ${connection-timeout} + # 数据源配置end + + # 读写分离配置begin + master-slave-rules: + #数据源 + duanju: + masterDataSourceName: duanju + slaveDataSourceNames: + - duanju-slave + duanju-0: + masterDataSourceName: duanju-0 + slaveDataSourceNames: + - duanju-slave-0 + duanju-1: + masterDataSourceName: duanju-1 + slaveDataSourceNames: + - duanju-slave-1 + duanju-2: + masterDataSourceName: duanju-2 + slaveDataSourceNames: + - duanju-slave-2 + duanju-3: + masterDataSourceName: duanju-3 + slaveDataSourceNames: + - duanju-slave-3 + duanju-4: + masterDataSourceName: duanju-4 + slaveDataSourceNames: + - duanju-slave-4 - # 读写分离配置begin - master-slave-rules: - #数据源 - duanju: - master-data-source-name: master-0 -# slave-data-source-names: slave-0,slave-1,slave-2 - slave-data-source-names: slave-2 -# - slave-0 -# - slave-1 -# - slave-2 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8ba8123c..642f984a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -65,7 +65,7 @@ spring: allow-bean-definition-overriding: true # 环境 dev|test|prod profiles: - active: local + active: prod # jackson时间格式化 jackson: time-zone: GMT+8 @@ -93,74 +93,79 @@ spring: # pathmatch: # matching-strategy: ant_path_matcher shardingsphere: - center-tables: - - activity - - app - - banner - - cash_out - - comment_good - - common_info - - complet_award - - coupon - - coupon_user - - course - - course_classification - - course_collect - - course_comment + # 短剧集表 通过course_id 分 + course-details: - course_details - - course_user - - disc_spinning - - disc_spinning_amount - - disc_spinning_record - - help_classify - - help_word - - invite - - invite_award - - invite_money - - message_info - - msg + #分库表 通过user_Id分 + region-tables: + - user_money_details - orders - - pay_classify + - course_collect - pay_details - - qrtz_blob_triggers - - qrtz_calendars - - qrtz_cron_triggers - - qrtz_fired_triggers - - qrtz_job_details - - qrtz_locks - - qrtz_paused_trigger_grps - - qrtz_scheduler_state - - qrtz_simple_triggers - - qrtz_simprop_triggers - - qrtz_triggers - - schedule_job + - disc_spinning_record + - cash_out + - course_user + - tb_user + - task_center_record + - user_money + - user_sign_record + - invite_achievement + - invite_money + #中心表 + center-tables: + - message_info - schedule_job_log + - invite + - msg + - sys_role_menu - sdk_info + - course + - user_integral_details + - common_info + - sys_log + - user_vip + - uni_ad_callback_record + - sys_user_role + - sys_menu + - comment_good + - sys_user + - course_comment + - banner + - disc_spinning + - course_classification + - task_center - sdk_type - - search - - sys_captcha + - task_center_reward + - schedule_job + - help_word + - help_classify + - disc_spinning_amount + - activity + - vip_details + - sys_role + - pay_classify + - app + - invite_award + - complet_award + - url_address - sys_config - sys_dict - - sys_log - - sys_menu - sys_oss - - sys_role - - sys_role_menu - - sys_user - - sys_user_role - - sys_user_token - - task_center - - task_center_record - - task_center_reward - - tb_user - - uni_ad_callback_record - - url_address - - user_integral - - user_integral_details - - user_money - - user_money_details + - search + - coupon_user + - coupon - user_prize_exchange - - user_sign_record - - user_vip - - vip_details - - invite_achievement \ No newline at end of file + - user_integral + - sys_user_token + - sys_captcha + - qrtz_triggers + - qrtz_simprop_triggers + - qrtz_simple_triggers + - qrtz_scheduler_state + - qrtz_paused_trigger_grps + - qrtz_locks + - qrtz_job_details + - qrtz_fired_triggers + - qrtz_cron_triggers + - qrtz_calendars + - qrtz_blob_triggers \ No newline at end of file diff --git a/src/main/resources/mapper/banner/BannerDao.xml b/src/main/resources/mapper/banner/BannerDao.xml index 9d9c71ba..13c26af2 100644 --- a/src/main/resources/mapper/banner/BannerDao.xml +++ b/src/main/resources/mapper/banner/BannerDao.xml @@ -16,7 +16,7 @@ - select * from banner where classify=#{classify} order by `sort` desc 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 97c03e93..10dd5fc4 100644 --- a/src/main/resources/mapper/course/CourseCollectDao.xml +++ b/src/main/resources/mapper/course/CourseCollectDao.xml @@ -26,50 +26,7 @@ GROUP BY u.course_id, c.course_id, d.course_details_name, d.course_details_id ORDER BY - produceEndTime DESC - - + produceEndTime DESC; diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index 9562bcd9..118aeb2f 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -249,7 +249,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