Skip to content

Administrator / framework-tools

Go to a project
Commit ca8bb87c by renrui
Options

[add]代码修改

1 parent 633883d7
Expand all
Inline Side-by-side
Showing with 22 additions and 2 deletions
system-manage/src/main/java/org/arch/manage/conterller/UserController.java
...@@ -18,6 +18,9 @@ import org.arch.base.utils.StringUtils; ...@@ -18,6 +18,9 @@ import org.arch.base.utils.StringUtils;
import org.arch.common.modules.sysmange.dto.*; import org.arch.common.modules.sysmange.dto.*;
import org.arch.common.modules.sysmange.entity.User; import org.arch.common.modules.sysmange.entity.User;
import org.arch.common.modules.sysmange.vo.UsersRoles; import org.arch.common.modules.sysmange.vo.UsersRoles;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.manage.service.RoleService; import org.arch.manage.service.RoleService;
import org.arch.manage.service.UserService; import org.arch.manage.service.UserService;
import org.arch.manage.service.UsersRolesService; import org.arch.manage.service.UsersRolesService;
...@@ -28,6 +31,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -28,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 用户controller * 用户controller
...@@ -52,6 +56,7 @@ public class UserController { ...@@ -52,6 +56,7 @@ public class UserController {
*/ */
@ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询") @ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询")
@PostMapping("/page") @PostMapping("/page")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "根据条件分页查询")
public Result<Page<UserDto>> page(@RequestBody @Validated UserQueryDto userQuery){ public Result<Page<UserDto>> page(@RequestBody @Validated UserQueryDto userQuery){
IPage<User> queryPage = new Page<>(); IPage<User> queryPage = new Page<>();
queryPage.setCurrent((userQuery.getCurrPage()==null || userQuery.getCurrPage()<=0)?1:userQuery.getCurrPage()); queryPage.setCurrent((userQuery.getCurrPage()==null || userQuery.getCurrPage()<=0)?1:userQuery.getCurrPage());
...@@ -102,6 +107,7 @@ public class UserController { ...@@ -102,6 +107,7 @@ public class UserController {
*/ */
@ApiOperation(value = "添加用户信息", notes = "添加用户信息") @ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/add") @PostMapping("/add")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
public Result create(@RequestBody UserAddDto user){ public Result create(@RequestBody UserAddDto user){
boolean flag = userService.create(user); boolean flag = userService.create(user);
if(flag){ if(flag){
...@@ -117,6 +123,7 @@ public class UserController { ...@@ -117,6 +123,7 @@ public class UserController {
*/ */
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息") @ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/update") @PostMapping("/update")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
public Result update(@RequestBody UserUpdateDto user){ public Result update(@RequestBody UserUpdateDto user){
boolean flag = userService.update(user); boolean flag = userService.update(user);
if(flag){ if(flag){
...@@ -128,6 +135,7 @@ public class UserController { ...@@ -128,6 +135,7 @@ public class UserController {
@ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息") @ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息")
@PostMapping("/get") @PostMapping("/get")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path") @ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户id获取用户信息", moduleName = "根据用户id获取用户信息")
public Result<UserDto> getById(@RequestBody String id){ public Result<UserDto> getById(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id); JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id"); id = jsonObject.getString("id");
...@@ -143,6 +151,7 @@ public class UserController { ...@@ -143,6 +151,7 @@ public class UserController {
@ApiOperation(value = "删除用户信息", notes = "删除用户信息") @ApiOperation(value = "删除用户信息", notes = "删除用户信息")
@PostMapping("/delete") @PostMapping("/delete")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path") @ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-删除用户信息", moduleName = "删除用户信息")
public Result delete(@RequestBody String id){ public Result delete(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id); JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id"); id = jsonObject.getString("id");
...@@ -165,6 +174,7 @@ public class UserController { ...@@ -165,6 +174,7 @@ public class UserController {
*/ */
@PostMapping(value = "/batchDelete") @PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除用户", notes = "批量删除用户") @ApiOperation(value = "批量删除用户", notes = "批量删除用户")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除用户", moduleName = "批量删除用户")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids){ public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids){
if(ids == null || ids.size() < 1){ if(ids == null || ids.size() < 1){
throw new BDException("用户id不能为空"); throw new BDException("用户id不能为空");
...@@ -183,6 +193,7 @@ public class UserController { ...@@ -183,6 +193,7 @@ public class UserController {
*/ */
@PostMapping(value = "/getUserTypes") @PostMapping(value = "/getUserTypes")
@ApiOperation(value = "获取员工类型", notes = "获取员工类型") @ApiOperation(value = "获取员工类型", notes = "获取员工类型")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工类型", moduleName = "获取员工类型")
public Result<List<UserTypeDto>> getUserTypes(){ public Result<List<UserTypeDto>> getUserTypes(){
List<UserTypeDto> userTypeDtos = new ArrayList<>(); List<UserTypeDto> userTypeDtos = new ArrayList<>();
for (UserTypeEnum entity : UserTypeEnum.values()){ for (UserTypeEnum entity : UserTypeEnum.values()){
...@@ -200,6 +211,7 @@ public class UserController { ...@@ -200,6 +211,7 @@ public class UserController {
*/ */
@PostMapping(value = "/getUserSex") @PostMapping(value = "/getUserSex")
@ApiOperation(value = "获取员工性别", notes = "获取员工性别") @ApiOperation(value = "获取员工性别", notes = "获取员工性别")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工性别", moduleName = "获取员工性别")
public Result<List<UserTypeDto>> getUserSex(){ public Result<List<UserTypeDto>> getUserSex(){
List<UserSexDto> userSexDtos = new ArrayList<>(); List<UserSexDto> userSexDtos = new ArrayList<>();
for (SexEnum entity : SexEnum.values()){ for (SexEnum entity : SexEnum.values()){
...@@ -216,9 +228,14 @@ public class UserController { ...@@ -216,9 +228,14 @@ public class UserController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
@GetMapping(value = "/getIscUserByName") @PostMapping(value = "/getIscUserByName")
@ApiOperation(value = "根据用户名获取isc用户信息", notes = "根据用户名获取isc用户信息") @ApiOperation(value = "根据用户名获取isc用户信息", notes = "根据用户名获取isc用户信息")
public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{ @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户名获取isc用户信息", moduleName = "根据用户名获取isc用户信息")
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
public Result<List<User>> getIscUserByName(@RequestBody Map<String, String> map) throws Exception{
String name = map.get("name");
String userLoginCode = map.get("userLoginCode");
if(StringUtils.isBlank(name) && StringUtils.isBlank(userLoginCode)){ if(StringUtils.isBlank(name) && StringUtils.isBlank(userLoginCode)){
return Result.error("用户姓名和账号不能都为空！"); return Result.error("用户姓名和账号不能都为空！");
//return Result.success("用户姓名不能为空！"); //return Result.success("用户姓名不能为空！");
...@@ -261,6 +278,7 @@ public class UserController { ...@@ -261,6 +278,7 @@ public class UserController {
*/ */
@ApiOperation(value = "添加用户信息", notes = "添加用户信息") @ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/addIscUser") @PostMapping("/addIscUser")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
public Result addIscUser(@ApiParam(value = "用户集合", required = true) @RequestBody List<User> userList){ public Result addIscUser(@ApiParam(value = "用户集合", required = true) @RequestBody List<User> userList){
QueryWrapper<Role> queryWrapper = new QueryWrapper<>(); QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("role_sign", "bus_user"); queryWrapper.eq("role_sign", "bus_user");
...@@ -298,6 +316,7 @@ public class UserController { ...@@ -298,6 +316,7 @@ public class UserController {
*/ */
@ApiOperation(value = "根据角色查询用户集合", notes = "根据角色查询用户集合") @ApiOperation(value = "根据角色查询用户集合", notes = "根据角色查询用户集合")
@PostMapping("/getUserList") @PostMapping("/getUserList")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合", moduleName = "根据角色查询用户集合")
public Result<List<UserDto>> getUserList(@RequestBody RoleUpdateDto roleUpdate){ public Result<List<UserDto>> getUserList(@RequestBody RoleUpdateDto roleUpdate){
return Result.success(userService.getUserList(roleUpdate)); return Result.success(userService.getUserList(roleUpdate));
...@@ -306,6 +325,7 @@ public class UserController { ...@@ -306,6 +325,7 @@ public class UserController {
@ApiOperation(value = "根据角色查询用户集合(包括所在部门)", notes = "根据角色查询用户集合(包括所在部门)") @ApiOperation(value = "根据角色查询用户集合(包括所在部门)", notes = "根据角色查询用户集合(包括所在部门)")
@PostMapping("/getUserListAll") @PostMapping("/getUserListAll")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合(包括所在部门)", moduleName = "根据角色查询用户集合(包括所在部门)")
public Result<List<UserDto>> getUserList1(@RequestBody RoleUpdateDto roleUpdate){ public Result<List<UserDto>> getUserList1(@RequestBody RoleUpdateDto roleUpdate){
List<UserDto> userListAll = userService.getUserListAll(roleUpdate); List<UserDto> userListAll = userService.getUserListAll(roleUpdate);
return Result.success(userListAll); return Result.success(userListAll);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!