screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -5,9 +5,7 @@ import com.moral.api.pojo.form.account.AccountInsertForm; import com.moral.api.pojo.form.account.AccountQueryForm; import com.moral.api.pojo.form.account.AccountUpdateForm; import com.moral.api.pojo.vo.account.AccountDeleteVO; import com.moral.api.pojo.vo.account.AccountQueryVO; import com.moral.api.pojo.vo.account.AccountUpdateVO; import com.moral.api.service.ManageAccountService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; screen-manage/src/main/java/com/moral/api/controller/GroupController.java
New file @@ -0,0 +1,36 @@ package com.moral.api.controller; import com.moral.constant.ResultMessage; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * @ClassName GroupController * @Description TODO * @Author 陈凯裕 * @Date 2021/5/11 10:16 * @Version TODO **/ @Slf4j @Api(tags = {"前台角色管理"}) @RestController @CrossOrigin(origins = "*", maxAge = 3600) @RequestMapping("/group") public class GroupController { /** * @Description: 给admin角色分配前台菜单 * @Param: [] * @return: com.moral.constant.ResultMessage * @Author: 陈凯裕 * @Date: 2021/5/11 */ @PostMapping("update") public ResultMessage update() { return null; } } screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -48,10 +48,7 @@ //处理插入业务 OrganizationDTO dto = organizationService.insertOrganization(form); //转换前端需要的参数 OrganizationInsertVO vo = OrganizationInsertVO.convert(dto); return new ResultMessage(dto.getCode(), dto.getMsg(), vo); return new ResultMessage(dto.getCode(), dto.getMsg(), null); } @PostMapping("update") @@ -71,10 +68,7 @@ //处理更新业务 OrganizationDTO dto = organizationService.updateOrganization(form); //转换前端需要的参数 OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto); return new ResultMessage(dto.getCode(), dto.getMsg(), vo); return new ResultMessage(dto.getCode(), dto.getMsg(), null); } @PostMapping("delete") @@ -87,10 +81,7 @@ //处理删除业务 OrganizationDTO dto = organizationService.deleteOrganization(form); //转换前端需要的参数 OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto); return new ResultMessage(dto.getCode(), dto.getMsg(), vo); return new ResultMessage(dto.getCode(), dto.getMsg(), null); } @GetMapping("query") screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java
New file @@ -0,0 +1,17 @@ package com.moral.api.pojo.form.group; import lombok.Data; /** * @ClassName GroupUpdateForm * @Description TODO * @Author 陈凯裕 * @Date 2021/5/11 10:25 * @Version TODO **/ @Data public class GroupUpdateForm { private Integer organizationId; } screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
File was deleted screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
File was deleted screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationDeleteVO.java
File was deleted screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationInsertVO.java
File was deleted screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationUpdateVO.java
File was deleted screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -91,26 +91,10 @@ organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST.getMsg()); return organizationDTO; } //查询父组织是否存在 Integer parentId = organization.getParentId(); Organization parentOrganization = new Organization(); if (!ObjectUtils.isEmpty(parentId)) { parentOrganization.setId(parentId); parentOrganization.setIsDelete(Constants.NOT_DELETE); queryWrapper.setEntity(parentOrganization); parentOrganization = organizationMapper.selectOne(queryWrapper); if (ObjectUtils.isEmpty(parentOrganization)) { organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode()); organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg()); return organizationDTO; } } //插入组织 organizationMapper.insert(organization); //封装DTO信息 organizationDTO.setParentOrganization(parentOrganization); organizationDTO.setOrganization(organization); organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); @@ -149,21 +133,6 @@ return organizationDTO; } //如果更改了父组织，查询父组织是否存在 Integer parentId = organization.getParentId(); Organization parentOrganization = new Organization(); if (!ObjectUtils.isEmpty(parentId) && parentId != 0) { QueryWrapper<Organization> existParentWrapper = new QueryWrapper<>(); parentOrganization.setId(parentId); parentOrganization.setIsDelete(Constants.NOT_DELETE); existParentWrapper.setEntity(parentOrganization); parentOrganization = organizationMapper.selectOne(existParentWrapper); if (ObjectUtils.isEmpty(parentOrganization)) { organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode()); organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg()); return organizationDTO; } } //更新组织 organizationMapper.updateById(organization); @@ -172,8 +141,6 @@ organization = organizationMapper.selectById(organization.getId()); //封装DTO信息 organizationDTO.setParentOrganization(parentOrganization); organizationDTO.setOrganization(organization); organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); @@ -182,6 +149,8 @@ return organizationDTO; } /** * @Description: 删除客户组织 @@ -197,7 +166,7 @@ //取参 Integer id = form.getOrganizationId(); //查询组织是否存在 //查询要删除的组织用于插入日志 Organization existOrganization = new Organization(); existOrganization.setIsDelete(Constants.NOT_DELETE); existOrganization.setId(id); @@ -252,7 +221,6 @@ } //封装返回结果 dto.setOrganization(existOrganization); dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); //操作插入日志 screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.config.mybatis.wrapper.NullFilterWrapper; import com.moral.api.entity.Group; import com.moral.api.entity.Organization; import com.moral.api.entity.User; import com.moral.api.entity.UserGroup; import com.moral.api.mapper.GroupMapper; import com.moral.api.mapper.OrganizationMapper; import com.moral.api.mapper.UserGroupMapper; import com.moral.api.mapper.UserMapper; import com.moral.api.pojo.dto.user.UserDTO; import com.moral.api.pojo.dto.user.UserQueryDTO; @@ -44,6 +48,10 @@ UserMapper userMapper; @Autowired OrganizationMapper organizationMapper; @Autowired GroupMapper groupMapper; @Autowired UserGroupMapper userGroupMapper; @Override public UserQueryDTO queryUsers(UserQueryForm form) { @@ -183,8 +191,19 @@ dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_EXIST.getMsg()); return dto; } //插入 //插入用户表 userMapper.insert(user); //创建组织admin角色 Group group = new Group(); group.setOrganizationId(organizationId); group.setGroupName("admin"); groupMapper.insert(group); //插入账号角色关联表 UserGroup userGroup = new UserGroup(); userGroup.setUserId(user.getId()); userGroup.setGroupId(group.getId()); userGroup.setOrganizationId(organizationId); userGroupMapper.insert(userGroup); //更新组织 Organization organization = new Organization(); organization.setAdminUserId(user.getId());
