|
@@ -2,6 +2,7 @@ package com.huaxu.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.huaxu.entity.UserEntity;
|
|
import com.huaxu.entity.UserGroup;
|
|
import com.huaxu.entity.UserGroup;
|
|
import com.huaxu.model.AjaxMessage;
|
|
import com.huaxu.model.AjaxMessage;
|
|
import com.huaxu.model.Pagination;
|
|
import com.huaxu.model.Pagination;
|
|
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
+import java.util.List;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 用户组(UserGroup)控制层
|
|
* 用户组(UserGroup)控制层
|
|
*
|
|
*
|
|
@@ -24,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/userGroup")
|
|
@RequestMapping("/userGroup")
|
|
-@Api(tags = "")
|
|
|
|
|
|
+@Api(tags = "用户组")
|
|
public class UserGroupController {
|
|
public class UserGroupController {
|
|
/**
|
|
/**
|
|
* 服务对象
|
|
* 服务对象
|
|
@@ -39,7 +42,7 @@ public class UserGroupController {
|
|
* @return 单条数据
|
|
* @return 单条数据
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "get", method = RequestMethod.POST)
|
|
@RequestMapping(value = "get", method = RequestMethod.POST)
|
|
- @ApiOperation(value = "查询设施配置列表")
|
|
|
|
|
|
+ @ApiOperation(value = "查询用户组")
|
|
public AjaxMessage<UserGroup> selectOne(
|
|
public AjaxMessage<UserGroup> selectOne(
|
|
@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
UserGroup result = userGroupService.selectById(userGroup.getId());
|
|
UserGroup result = userGroupService.selectById(userGroup.getId());
|
|
@@ -54,7 +57,7 @@ public class UserGroupController {
|
|
* @return Response对象
|
|
* @return Response对象
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "insert", method = RequestMethod.POST)
|
|
@RequestMapping(value = "insert", method = RequestMethod.POST)
|
|
- @ApiOperation(value = "查询设施配置列表")
|
|
|
|
|
|
+ @ApiOperation(value = "插入用户组")
|
|
public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
int result = userGroupService.insert(userGroup);
|
|
int result = userGroupService.insert(userGroup);
|
|
|
|
|
|
@@ -68,25 +71,16 @@ public class UserGroupController {
|
|
* @return Response对象
|
|
* @return Response对象
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "update", method = RequestMethod.POST)
|
|
@RequestMapping(value = "update", method = RequestMethod.POST)
|
|
- @ApiOperation(value = "查询设施配置列表")
|
|
|
|
|
|
+ @ApiOperation(value = "更新/删除用户组")
|
|
public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
int result = userGroupService.update(userGroup);
|
|
int result = userGroupService.update(userGroup);
|
|
|
|
+ if(result==-1){
|
|
|
|
+ return new AjaxMessage<>(ResultStatus.USERGROUP_HAS_USER);
|
|
|
|
+ }
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 删除一条数据
|
|
|
|
- *
|
|
|
|
- * @param userGroup 参数对象
|
|
|
|
- * @return Response对象
|
|
|
|
- */
|
|
|
|
- @RequestMapping(value = "delete", method = RequestMethod.POST)
|
|
|
|
- @ApiOperation(value = "查询设施配置列表")
|
|
|
|
- public AjaxMessage<Integer> delete(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
|
|
|
|
- int result = userGroupService.deleteById(userGroup.getId());
|
|
|
|
- return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -97,13 +91,22 @@ public class UserGroupController {
|
|
* @return Response对象
|
|
* @return Response对象
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "selectPage", method = RequestMethod.POST)
|
|
@RequestMapping(value = "selectPage", method = RequestMethod.POST)
|
|
- @ApiOperation(value = "查询设施配置列表")
|
|
|
|
- public AjaxMessage<Pagination<UserGroup>> selectPage(Integer pageNum, Integer pageSize) {
|
|
|
|
|
|
+ @ApiOperation(value = "查询用户组列表")
|
|
|
|
+ public AjaxMessage<Pagination<UserGroup>> selectPage(Integer pageNum, Integer pageSize,String name) {
|
|
UserGroup userGroup = new UserGroup();
|
|
UserGroup userGroup = new UserGroup();
|
|
|
|
+ userGroup.setGroupName(name);
|
|
IPage<UserGroup> iPage = new Page<>(pageNum, pageSize);
|
|
IPage<UserGroup> iPage = new Page<>(pageNum, pageSize);
|
|
iPage = userGroupService.selectPage(userGroup, iPage);
|
|
iPage = userGroupService.selectPage(userGroup, iPage);
|
|
Pagination<UserGroup> pages = new Pagination<>(iPage);
|
|
Pagination<UserGroup> pages = new Pagination<>(iPage);
|
|
return new AjaxMessage<>(ResultStatus.OK, pages);
|
|
return new AjaxMessage<>(ResultStatus.OK, pages);
|
|
}
|
|
}
|
|
|
|
+ @RequestMapping(value = "findUsersByUserGroup", method = RequestMethod.POST)
|
|
|
|
+ @ApiOperation(value = "查询用户组对应user")
|
|
|
|
+ AjaxMessage<List<UserEntity>> findUsersByUserGroup(@ApiParam(value = "用户组id", required = true)Integer id){
|
|
|
|
+ UserGroup userGroup=new UserGroup();
|
|
|
|
+ userGroup.setId(id);
|
|
|
|
+ return new AjaxMessage<>(ResultStatus.OK,
|
|
|
|
+ userGroupService.findUsersByUserGroup(userGroup));
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|