From ca5445257b1fdeceddf3fcc2dea18c442023aeb7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Fri, 08 Dec 2023 09:30:36 +0800
Subject: [PATCH] 新街口
---
assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysUserController.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/SysUserController.java b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysUserController.java
similarity index 64%
rename from assess-admin/src/main/java/com/gkhy/assess/admin/controller/SysUserController.java
rename to assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysUserController.java
index 871800b..fe343cb 100644
--- a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/SysUserController.java
+++ b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysUserController.java
@@ -1,8 +1,10 @@
-package com.gkhy.assess.admin.controller;
+package com.gkhy.assess.admin.controller.web;
+import com.gkhy.assess.common.annotation.RepeatSubmit;
import com.gkhy.assess.common.api.CommonResult;
import com.gkhy.assess.common.validate.AgencyGroup;
import com.gkhy.assess.common.validate.ExpertGroup;
+import com.gkhy.assess.common.validate.MonitorGroup;
import com.gkhy.assess.system.domain.SysUser;
import com.gkhy.assess.system.service.SysUserService;
import io.swagger.annotations.Api;
@@ -55,13 +57,22 @@
return CommonResult.success(sysUserService.expertList(user));
}
-
- @ApiOperation(value = "机构注册")
- @PostMapping("/agencyRegister")
- public CommonResult agencyRegister(@Validated(AgencyGroup.class) @RequestBody SysUser user){
- return CommonResult.success(sysUserService.agencyRegister(user));
+ @RepeatSubmit
+ @ApiOperation(value = "创建监管用户")
+ @PostMapping("/addMonitor")
+ public CommonResult addMonitor(@Validated(MonitorGroup.class) @RequestBody SysUser user){
+ return CommonResult.success(sysUserService.addMonitor(user));
}
+
+ @RepeatSubmit
+ @ApiOperation(value = "机构注册")
+ @PostMapping("/addAgency")
+ public CommonResult addAgency(@Validated(AgencyGroup.class) @RequestBody SysUser user){
+ return CommonResult.success(sysUserService.addAgency(user));
+ }
+
+ @RepeatSubmit
@RequiresPermissions(value={"system:assess:monitor","system:assess:agency"},logical = Logical.OR)
@ApiOperation(value = "创建专家")
@PostMapping("/addExpert")
@@ -69,58 +80,84 @@
return CommonResult.success(sysUserService.addExpert(user));
}
+ @RepeatSubmit
+ @RequiresPermissions("system:assess:monitor")
+ @ApiOperation(value = "编辑监管用户")
+ @PutMapping("/editMonitor")
+ public CommonResult editMonitor(@RequestBody SysUser user){
+ return CommonResult.success(sysUserService.editMonitor(user));
+ }
+
+ @RepeatSubmit
@RequiresPermissions("system:assess:monitor")
@ApiOperation(value = "编辑机构")
@PutMapping("/editAgency")
- public CommonResult editAgency(@Validated(ExpertGroup.class) @RequestBody SysUser user){
+ public CommonResult editAgency(@RequestBody SysUser user){
return CommonResult.success(sysUserService.editAgency(user));
}
+ @RepeatSubmit
@RequiresPermissions(value={"system:assess:monitor","system:assess:agency"},logical = Logical.OR)
@ApiOperation(value = "编辑专家")
@PutMapping("/editExpert")
- public CommonResult editExpert(@Validated(ExpertGroup.class) @RequestBody SysUser user){
+ public CommonResult editExpert(@RequestBody SysUser user){
return CommonResult.success(sysUserService.editExpert(user));
+ }
+
+ @ApiOperation(value = "根据id获取用户详情")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "userId", dataType = "int", required = true, value = "用户id")
+ })
+ @GetMapping("/getUserById")
+ public CommonResult getUserById(@RequestParam(required = true) Long userId){
+ return CommonResult.success(sysUserService.getUserInfoById(userId));
}
@ApiOperation(value = "校验用户名")
@PostMapping("/checkUserNameUnique")
- public boolean checkLoginNameUnique(SysUser user)
+ public CommonResult checkLoginNameUnique(@RequestBody SysUser user)
{
- return sysUserService.checkUsernameUnique(user);
+ return CommonResult.success(sysUserService.checkUsernameUnique(user));
}
@ApiOperation(value = "校验手机号")
@PostMapping("/checkPhoneUnique")
- public boolean checkPhoneUnique(SysUser user)
+ public CommonResult checkPhoneUnique(@RequestBody SysUser user)
{
- return sysUserService.checkPhoneUnique(user);
+ return CommonResult.success(sysUserService.checkPhoneUnique(user));
+ }
+
+ @RepeatSubmit
+ @ApiOperation(value = "用户修改密码")
+ @PutMapping("/resetUserPwd")
+ public CommonResult resetUserPwd(@RequestBody SysUser user)
+ {
+ return CommonResult.success(sysUserService.resetUserPwd(user));
}
-
- /**
- * 用户状态修改
- */
+ @RepeatSubmit
@RequiresPermissions(value={"system:assess:monitor","system:assess:agency"},logical = Logical.OR)
@ApiOperation(value = "用户状态修改,停用/启用")
@PostMapping("/changeStatus")
- public CommonResult changeStatus(SysUser user)
+ public CommonResult changeStatus(@RequestBody SysUser user)
{
return CommonResult.success(sysUserService.changeUserStatus(user));
}
+ @RepeatSubmit
@RequiresPermissions("system:assess:monitor")
- @ApiOperation(value = "审批状态修改,停用/启用")
+ @ApiOperation(value = "审批状态修改,审批状态(0暂存，1审核中，2审批通过，3审批驳回，4已作废)")
@PostMapping("/changeApprove")
- public CommonResult changeApprove(SysUser user)
+ public CommonResult changeApprove(@RequestBody SysUser user)
{
return CommonResult.success(sysUserService.changeApprove(user));
}
+ @RepeatSubmit
@RequiresPermissions(value={"system:assess:monitor","system:assess:agency"},logical = Logical.OR)
@ApiOperation(value = "根据id删除用户")
@DeleteMapping("/remove/{userId}")
@@ -131,4 +168,5 @@
+
}
--
Gitblit v1.9.2