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:
77
2024-04-20 23:00:16 +08:00
parent 10486e593a
commit bd9eb02713
18 changed files with 327 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,10 +11,15 @@ 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.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserAuth;
import com.ruoyi.xq.dto.admin.user.UserAuthAdminVo;
import com.ruoyi.xq.dto.admin.userauth.UserAuthAdminInfoVo;
import com.ruoyi.xq.service.UserAuthService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -53,21 +58,12 @@ public class UserAuthController extends BaseController {
*/
@SaCheckPermission("xq:userAuth:query")
@GetMapping("/{id}")
public R<UserAuth> getInfo(@NotNull(message = "主键不能为空")
public R<UserAuthAdminInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(userAuthService.getById(id));
UserAuthAdminInfoVo vo = userAuthService.getAdminById(id);
return R.ok(vo);
}
/**
* 新增用户认证管理
*/
@SaCheckPermission("xq:userAuth:add")
@Log(title = "用户认证管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAuth bo) {
return toAjax(userAuthService.save(bo));
}
/**
* 修改用户认证管理
@@ -77,19 +73,8 @@ public class UserAuthController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAuth bo) {
return toAjax(userAuthService.updateById(bo));
userAuthService.updateUserAuth(bo);
return R.ok();
}
/**
* 删除用户认证管理
*
* @param ids 主键串
*/
@SaCheckPermission("xq:userAuth:remove")
@Log(title = "用户认证管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(userAuthService.removeBatchByIds(Arrays.asList(ids)));
}
}

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

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq;
import com.ruoyi.xq.service.UserInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -58,15 +59,11 @@ public class UserInfoController extends BaseController {
return R.ok(userInfoService.getById(id));
}
/**
* 新增用户信息
*/
@SaCheckPermission("xq:userInfo:add")
@Log(title = "用户信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserInfo bo) {
return toAjax(userInfoService.save(bo));
@SaCheckPermission("xq:userInfo:query")
@GetMapping("/userInfoUpdate")
public R<UpdateUserInfoReq> userInfoUpdate(Long userId) {
UpdateUserInfoReq res = userInfoService.getUserInfoUpdate(userId);
return R.ok(res);
}
/**
@@ -76,8 +73,9 @@ public class UserInfoController extends BaseController {
@Log(title = "用户信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInfo bo) {
return toAjax(userInfoService.updateById(bo));
public R<Void> edit(@RequestBody UpdateUserInfoReq bo) {
userInfoService.updateInfo(bo);
return R.ok();
}
/**