shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
张良(004796)
2024-03-12 18:52:48 +08:00
parent cbf8192a73
commit b069314684
26 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserAuthController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -43,7 +42,7 @@ public class UserAuthController extends BaseController {
@SaCheckPermission("xq:userAuth:list")
@GetMapping("/list")
public TableDataInfo<UserAuthAdminVo> list(UserAuthAdminVo bo, PageQuery pageQuery) {
Page<UserAuthAdminVo> page = userAuthService.pageApp(pageQuery, bo);
Page<UserAuthAdminVo> page = userAuthService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java
View File

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import com.ruoyi.xq.service.UserExtendService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +42,8 @@ public class UserExtendController extends BaseController {
*/
@SaCheckPermission("xq:userExtend:list")
@GetMapping("/list")
public TableDataInfo<UserExtend> list(UserExtend bo, PageQuery pageQuery) {
Page<UserExtend> page = userExtendService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserExtendAdminVo> list(UserExtendAdminVo bo, PageQuery pageQuery) {
Page<UserExtendAdminVo> page = userExtendService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java
View File

@@ -42,7 +42,7 @@ public class UserInfoController extends BaseController {
@SaCheckPermission("xq:userInfo:list")
@GetMapping("/list")
public TableDataInfo<UserInfoAdminVo> list(UserInfoAdminVo bo, PageQuery pageQuery) {
Page<UserInfoAdminVo> page = userInfoService.appPage(pageQuery, bo);
Page<UserInfoAdminVo> page = userInfoService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -10,9 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
@@ -53,7 +50,7 @@ public class UserPicturesController extends BaseController {
@SaCheckPermission("xq:userPictures:list")
@GetMapping("/list")
public TableDataInfo<UserPicturesAdminVo> list(UserPicturesAdminVo bo, PageQuery pageQuery) {
Page<UserPicturesAdminVo> page = userPicturesService.pageApp(pageQuery, bo);
Page<UserPicturesAdminVo> page = userPicturesService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

7
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserVipController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -9,8 +8,6 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserVip;
@@ -22,9 +19,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* VIP用户
@@ -47,7 +42,7 @@ public class UserVipController extends BaseController {
@SaCheckPermission("xq:userVip:list")
@GetMapping("/list")
public TableDataInfo<UserVipAdminVo> list(UserVipAdminVo bo, PageQuery pageQuery) {
Page<UserVipAdminVo> page = userVipService.pageApp(pageQuery, bo);
Page<UserVipAdminVo> page = userVipService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}