【改进】分页

src/main/java/com/corewing/app/service/impl/AppModelCategoryServiceImpl.java

@@ -47,7 +47,7 @@ public class AppModelCategoryServiceImpl extends ServiceImpl<AppModelCategoryMap
 
     @Override
     public Page<AppModelCategory> page(ModelCategoryPageRequest modelCategoryPageRequest) {
-        Page<AppModelCategory> page = PageContext.getPage(AppModelCategory.class);
+        Page<AppModelCategory> page = PageContext.getDefaultPage(AppModelCategory.class);
         return appModelCategoryMapper.page(page, modelCategoryPageRequest);
     }
 

src/main/java/com/corewing/app/service/impl/AppModelServiceImpl.java

@@ -46,7 +46,7 @@ public class AppModelServiceImpl extends ServiceImpl<AppModelMapper, AppModel> i
 
     @Override
     public Page<AppModel> page(ModelPageRequest modelPageRequest) {
-        Page<AppModel> page = PageContext.getPage(AppModel.class);
+        Page<AppModel> page = PageContext.getDefaultPage(AppModel.class);
         return appModelMapper.page(page, modelPageRequest);
     }
 
@@ -196,7 +196,7 @@ public class AppModelServiceImpl extends ServiceImpl<AppModelMapper, AppModel> i
 
     @Override
     public Page<AppModel> favoritePage(ModelFavoritePageRequest modelFavoritePageRequest) {
-        Page<AppModel> page = PageContext.getPage(AppModel.class);
+        Page<AppModel> page = PageContext.getDefaultPage(AppModel.class);
         return appModelMapper.favoritePage(page, Long.valueOf(StpUtil.getLoginId().toString()), modelFavoritePageRequest);
     }
 
@@ -224,7 +224,7 @@ public class AppModelServiceImpl extends ServiceImpl<AppModelMapper, AppModel> i
 
     @Override
     public Page<AppModel> downloadLogPage(ModelDownloadLogPageRequest modelDownloadLogPageRequest) {
-        Page<AppModel> page = PageContext.getPage(AppModel.class);
+        Page<AppModel> page = PageContext.getDefaultPage(AppModel.class);
         return appModelMapper.downloadLogPage(page, Long.valueOf(StpUtil.getLoginId().toString()), modelDownloadLogPageRequest);
     }
 

src/main/java/com/corewing/app/service/impl/BizProductServiceImpl.java

@@ -19,7 +19,7 @@ public class BizProductServiceImpl extends ServiceImpl<BizProductMapper, BizProd
 
     @Override
     public Page<BizProduct> page(ProductPageRequest productPageRequest) {
-        Page<BizProduct> page = PageContext.getPage(BizProduct.class);
+        Page<BizProduct> page = PageContext.getDefaultPage(BizProduct.class);
         return bizProductMapper.page(page, productPageRequest);
     }
 }

src/main/java/com/corewing/app/service/impl/BizResourceServiceImpl.java

@@ -24,7 +24,7 @@ public class BizResourceServiceImpl extends ServiceImpl<BizResourceMapper, BizRe
 
     @Override
     public Page<BizResource> page(ResourcePageRequest resourcePageRequest) {
-        Page<BizResource> page = PageContext.getPage(BizResource.class);
+        Page<BizResource> page = PageContext.getDefaultPage(BizResource.class);
         return bizResourceMapper.page(page, resourcePageRequest);
     }
 }

src/main/java/com/corewing/app/service/impl/FeedbackServiceImpl.java

@@ -30,7 +30,7 @@ public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> i
 
     @Override
     public Page<Feedback> page(Feedback feedback) {
-        Page<Feedback> page = PageContext.getPage(Feedback.class);
+        Page<Feedback> page = PageContext.getDefaultPage(Feedback.class);
 //        LambdaQueryWrapper<Feedback> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(feedback.getStatus() != null, Feedback::getStatus, feedback.getStatus());
 //        wrapper.like(StringUtils.hasText(feedback.getTitle()), Feedback::getTitle, feedback.getTitle());

src/main/java/com/corewing/app/service/impl/FirmwareServiceImpl.java

@@ -23,7 +23,7 @@ public class FirmwareServiceImpl extends ServiceImpl<FirmwareMapper, Firmware> i
 
     @Override
     public Page<Firmware> page(Firmware firmware) {
-        Page<Firmware> page = PageContext.getPage(Firmware.class);
+        Page<Firmware> page = PageContext.getDefaultPage(Firmware.class);
         LambdaQueryWrapper<Firmware> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.hasText(firmware.getFirmwareName()), Firmware::getFirmwareName, firmware.getFirmwareName());
         queryWrapper.eq(firmware.getFirmwareType() != null, Firmware::getFirmwareType, firmware.getFirmwareType());

src/main/java/com/corewing/app/service/impl/PrivacyPolicyServiceImpl.java

@@ -16,7 +16,7 @@ public class PrivacyPolicyServiceImpl extends ServiceImpl<PrivacyPolicyMapper, P
 
     @Override
     public Page<PrivacyPolicy> page(PrivacyPolicy privacyPolicy) {
-        Page<PrivacyPolicy> page = PageContext.getPage(PrivacyPolicy.class);
+        Page<PrivacyPolicy> page = PageContext.getDefaultPage(PrivacyPolicy.class);
         LambdaQueryWrapper<PrivacyPolicy> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.hasText(privacyPolicy.getTitle()), PrivacyPolicy::getTitle, privacyPolicy.getTitle());
         queryWrapper.eq(privacyPolicy.getVisible() != null, PrivacyPolicy::getVisible, privacyPolicy.getVisible());

src/main/java/com/corewing/app/service/impl/SysUserServiceImpl.java

@@ -23,7 +23,7 @@ import java.time.LocalDateTime;
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
 
     public Page<SysUser> page(SysUser sysUser) {
-        Page<SysUser> page = PageContext.getPage(SysUser.class);
+        Page<SysUser> page = PageContext.getDefaultPage(SysUser.class);
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(sysUser.getStatus() != null, SysUser::getStatus, sysUser.getStatus());
         queryWrapper.like(StringUtils.hasText(sysUser.getUsername()), SysUser::getUsername, sysUser.getUsername());

src/main/java/com/corewing/app/service/impl/TutorialCategoryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 public class TutorialCategoryServiceImpl extends ServiceImpl<TutorialCategoryMapper, TutorialCategory> implements TutorialCategoryService {
 
     public Page<TutorialCategory> page(TutorialCategory tutorialCategory){
-        Page<TutorialCategory> page = PageContext.getPage(TutorialCategory.class);
+        Page<TutorialCategory> page = PageContext.getDefaultPage(TutorialCategory.class);
 
         LambdaQueryWrapper<TutorialCategory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.hasText(tutorialCategory.getCategoryTitle()), TutorialCategory::getCategoryTitle, tutorialCategory.getCategoryTitle());

src/main/java/com/corewing/app/service/impl/TutorialServiceImpl.java

@@ -24,9 +24,6 @@ public class TutorialServiceImpl extends ServiceImpl<TutorialMapper, Tutorial> i
     @Resource
     private TutorialCategoryRelationService tutorialCategoryRelationService;
 
-    @Resource
-    private TutorialCategoryService tutorialCategoryService;
-
     @Override
     public Page<Tutorial> pageList(Page<Tutorial> page, Long categoryId, String tutorialTitle, String lang) {
         return tutorialMapper.pageList(page, categoryId, tutorialTitle, lang);
@@ -34,7 +31,7 @@ public class TutorialServiceImpl extends ServiceImpl<TutorialMapper, Tutorial> i
 
     @Override
     public Page<Tutorial> page(Tutorial tutorial) {
-        Page<Tutorial> page = PageContext.getPage(Tutorial.class);
+        Page<Tutorial> page = PageContext.getDefaultPage(Tutorial.class);
         return tutorialMapper.page(page, tutorial);
     }
 

src/main/java/com/corewing/app/service/impl/UserServiceImpl.java

@@ -36,9 +36,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private VerifyCodeService verifyCodeService;
 
-    @Resource
-    private UserMapper userMapper;
-
     @Resource
     private RedisUtil redisUtil;
 
@@ -51,7 +48,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public Page<User> page(User user) {
-        Page<User> page = PageContext.getPage(User.class);
+        Page<User> page = PageContext.getDefaultPage(User.class);
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.hasText(user.getNickName()), User::getNickName, user.getNickName());
         queryWrapper.like(StringUtils.hasText(user.getUsername()), User::getUsername, user.getUsername());