This commit is contained in:
GYJ 2025-01-02 21:12:22 +08:00
parent 2025b4c397
commit b9c4c25537
9 changed files with 20 additions and 17 deletions

View File

@ -35,7 +35,7 @@ public class AppUpgradeController {
PageHelper.startPage(page,limit); PageHelper.startPage(page,limit);
List<App> list = iAppService.list(); List<App> list = iAppService.list();
PageInfo<App> pageInfo = new PageInfo<>(list); PageInfo<App> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo)); return Result.success().put("data", PageUtils.page(pageInfo, true));
} }

View File

@ -270,10 +270,8 @@ public class UserController {
@GetMapping("/courseMessage") @GetMapping("/courseMessage")
@ApiOperation("短剧分析") @ApiOperation("短剧分析")
public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) { public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) {
PageHelper.startPage(page.intValue(), limit.intValue()); PageUtils pageUtils = userService.queryCourseOrder(page, limit, type, TimeCompleteUtils.completeStartTime(date), sysUserId);
List<Map<String, Object>> list = userService.queryCourseOrder(type, TimeCompleteUtils.completeStartTime(date), sysUserId); return Result.success().put("data", pageUtils);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
} }
/** /**

View File

@ -2,6 +2,7 @@ package com.sqx.modules.app.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result; import com.sqx.common.utils.Result;
@ -212,7 +213,7 @@ public interface UserService extends IService<UserEntity> {
Double queryPayMoney(int type,String qdCode); Double queryPayMoney(int type,String qdCode);
List<Map<String, Object>> queryCourseOrder(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); int userMessage( String date, int type,String qdCode,Integer vipType);

View File

@ -1384,7 +1384,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
} }
@Override @Override
public List<Map<String, Object>> queryCourseOrder(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"); DateTime parse = DateUtil.parse(date, "yyyy-MM-dd");
String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00"); String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00");
@ -1396,7 +1396,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00"); startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00");
endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59"); endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59");
} }
return baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId);
PageHelper.startPage(page.intValue(), limit.intValue());
List<Map<String, Object>> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return PageUtils.page(pageInfo, true);
} }
@Override @Override

View File

@ -88,7 +88,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
queryWrapper.eq("banner_id", bannerId); queryWrapper.eq("banner_id", bannerId);
List<Course> coursePage = courseDao.selectList(queryWrapper); List<Course> coursePage = courseDao.selectList(queryWrapper);
PageInfo<Course> pageInfo = new PageInfo<>(coursePage); PageInfo<Course> pageInfo = new PageInfo<>(coursePage);
return Result.success().put("data", PageUtils.page(pageInfo)); return Result.success().put("data", PageUtils.page(pageInfo, true));
} }

View File

@ -110,7 +110,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
} }
} }
return Result.success().put("data", PageUtils.page(pageInfo)); return Result.success().put("data", PageUtils.page(pageInfo, true));
} }

View File

@ -184,11 +184,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(map); PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(map);
List<Map<String, Object>> records = pageInfo.getList(); List<Map<String, Object>> records = pageInfo.getList();
for (Map<String, Object> map : records) { for (Map<String, Object> m : records) {
map.put("courseDetailsId", null); m.put("courseDetailsId", null);
map.put("courseDetailsName", ""); m.put("courseDetailsName", "");
map.put("dyEpisodeId", ""); m.put("dyEpisodeId", "");
map.put("wxCourseDetailsId", ""); m.put("wxCourseDetailsId", "");
} }
PageUtils pageUtils = PageUtils.page(pageInfo); PageUtils pageUtils = PageUtils.page(pageInfo);
setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));

View File

@ -49,7 +49,6 @@ public class SdkInfoController {
*/ */
@GetMapping("getSdkList") @GetMapping("getSdkList")
public Result getSdkList(Integer page, Integer limit, SdkInfo sdkInfo) { public Result getSdkList(Integer page, Integer limit, SdkInfo sdkInfo) {
PageHelper.startPage(page, limit);
return Result.success().put("data", infoService.getSdkList(page, limit, sdkInfo)); return Result.success().put("data", infoService.getSdkList(page, limit, sdkInfo));
} }

View File

@ -73,7 +73,7 @@ public class SdkInfoServiceImpl extends ServiceImpl<SdkInfoDao, SdkInfo> impleme
} }
PageHelper.startPage(page, limit); PageHelper.startPage(page, limit);
List<SdkInfo> sdkList = baseMapper.getSdkList(sdkInfo); List<SdkInfo> sdkList = baseMapper.getSdkList(sdkInfo);
return PageUtils.page(new PageInfo<>(sdkList)); return PageUtils.page(new PageInfo<>(sdkList), true);
} }
@Override @Override