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 15:27:05 +08:00
parent 2bd2871df0
commit 7bc31dc69e
22 changed files with 298 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserAuthController.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.UserAuth;
import com.ruoyi.xq.dto.admin.user.UserAuthAdminVo;
import com.ruoyi.xq.service.UserAuthService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +42,8 @@ public class UserAuthController extends BaseController {
*/
@SaCheckPermission("xq:userAuth:list")
@GetMapping("/list")
public TableDataInfo<UserAuth> list(UserAuth bo, PageQuery pageQuery) {
Page<UserAuth> page = userAuthService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserAuthAdminVo> list(UserAuthAdminVo bo, PageQuery pageQuery) {
Page<UserAuthAdminVo> page = userAuthService.pageApp(pageQuery, bo);
return TableDataInfo.build(page);
}

19
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java
View File

@@ -15,12 +15,15 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
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;
import java.util.List;
import java.util.stream.Collectors;
/**
* 用户管理
@@ -46,6 +49,22 @@ public class UserController extends BaseController {
return TableDataInfo.build(page);
}
@GetMapping("/getByUsercode")
public R<User> getByUsercode(String usercode){
return R.ok(userService.getByUsercode(usercode));
}
@GetMapping("/listByUserCode")
public R<List<String>> listByUserCode(String usercode, int limit){
if(limit == 0){
limit = 40;
}
List<User> users = userService.list(Wrappers.lambdaQuery(User.class)
.select(User::getUsercode)
.like(StringUtils.isNotEmpty(usercode), User::getUsercode, usercode)
.last("limit " + limit));
return R.ok(users.stream().map(User::getUsercode).collect(Collectors.toList()));
}
/**
* 获取用户管理详细信息

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

@@ -12,7 +12,11 @@ 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;
import com.ruoyi.xq.dto.admin.user.UserVipAdminVo;
import com.ruoyi.xq.dto.admin.user.req.AddVipReq;
import com.ruoyi.xq.service.UserService;
import com.ruoyi.xq.service.UserVipService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -35,14 +39,15 @@ import java.util.Arrays;
public class UserVipController extends BaseController {
private final UserVipService userVipService;
private final UserService userService;
/**
* 查询VIP用户列表
*/
@SaCheckPermission("xq:userVip:list")
@GetMapping("/list")
public TableDataInfo<UserVip> list(UserVip bo, PageQuery pageQuery) {
Page<UserVip> page = userVipService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserVipAdminVo> list(UserVipAdminVo bo, PageQuery pageQuery) {
Page<UserVipAdminVo> page = userVipService.pageApp(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -58,38 +63,28 @@ public class UserVipController extends BaseController {
return R.ok(userVipService.getById(id));
}
/**
* 新增VIP用户
*/
@SaCheckPermission("xq:userVip:add")
@Log(title = "VIP用户", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVip bo) {
return toAjax(userVipService.save(bo));
}
/**
* 修改VIP用户
*/
@SaCheckPermission("xq:userVip:edit")
@Log(title = "VIP用户", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserVip bo) {
return toAjax(userVipService.updateById(bo));
@PostMapping("/addVip")
public R<Void> addVip(@RequestBody AddVipReq bo) {
User user = userService.getByUsercode(bo.getUsercode());
if(user == null){
return R.fail("用户不存在!");
}
userVipService.updateVipOrderAdmin(bo,user);
return R.ok();
}
/**
* 删除VIP用户
*
* @param ids 主键串
*/
@SaCheckPermission("xq:userVip:remove")
@Log(title = "VIP用户", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(userVipService.removeBatchByIds(Arrays.asList(ids)));
@DeleteMapping("/{id}")
public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long id) {
userVipService.removeVip(id);
return R.ok();
}
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/VipOrderController.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.VipOrder;
import com.ruoyi.xq.dto.admin.vipOrder.VipOrderAdminVo;
import com.ruoyi.xq.service.VipOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +42,8 @@ public class VipOrderController extends BaseController {
*/
@SaCheckPermission("xq:vipOrder:list")
@GetMapping("/list")
public TableDataInfo<VipOrder> list(VipOrder bo, PageQuery pageQuery) {
Page<VipOrder> page = vipOrderService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<VipOrderAdminVo> list(VipOrderAdminVo bo, PageQuery pageQuery) {
Page<VipOrderAdminVo> page = vipOrderService.pageApp(pageQuery, bo);
return TableDataInfo.build(page);
}