screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口

kaiyu

2021-06-09 657182c7989dc77b69bb3f9adaf6c75b6466ff95

 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java

@@ -6,20 +6,25 @@
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.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
import com.moral.api.pojo.form.organization.*;
import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.UserService;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service;
@@ -49,6 +54,15 @@

    @Autowired
    LogUtils logUtils;

    @Autowired
    UserService userService;

    @Autowired
    UserMapper userMapper;

    @Autowired
    MonitorPointService monitorPointService;

    Map<String, String> organizationFormMap;

@@ -83,26 +97,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());

@@ -128,34 +126,19 @@
        //form转entity
        Organization organization = organizationUpdateForm.formConvertEntity();

        //查询组织是否存在
        QueryWrapper<Organization> existWrapper = new QueryWrapper<>();
        Organization existOrganization = new Organization();
        existOrganization.setId(organization.getId());
        existOrganization.setIsDelete(Constants.NOT_DELETE);
        existWrapper.setEntity(existOrganization);
        existOrganization = organizationMapper.selectOne(existWrapper);
        if (ObjectUtils.isEmpty(existOrganization)) {
        //查找要更新的组织用于插入日志
        QueryWrapper<Organization> oldWrapper = new QueryWrapper<>();
        Organization oldOrganization = new Organization();
        oldOrganization.setId(organization.getId());
        oldOrganization.setIsDelete(Constants.NOT_DELETE);
        oldWrapper.setEntity(oldOrganization);
        oldOrganization = organizationMapper.selectOne(oldWrapper);
        if (ObjectUtils.isEmpty(oldOrganization)) {
            organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode());
            organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
            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);
@@ -164,16 +147,16 @@
        organization = organizationMapper.selectById(organization.getId());

        //封装DTO信息
        organizationDTO.setParentOrganization(parentOrganization);
        organizationDTO.setOrganization(organization);
        organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
        organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());

        //操作插入日志
        insertUpdateLog(organizationUpdateForm, organization, existOrganization);
        insertUpdateLog(organizationUpdateForm, organization, oldOrganization);

        return organizationDTO;
    }



    /**
     * @Description: 删除客户组织
@@ -189,7 +172,15 @@
        //取参
        Integer id = form.getOrganizationId();

        //查询组织是否存在
        //判断组织是否含有站点
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(id);
        if(!ObjectUtils.isEmpty(monitorPoints)){
            dto.setCode(ResponseCodeEnum.ORGANIZATION_EXIST_MONITORPOINT.getCode());
            dto.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST_MONITORPOINT.getMsg());
            return dto;
        }

        //查询要删除的组织用于插入日志
        Organization existOrganization = new Organization();
        existOrganization.setIsDelete(Constants.NOT_DELETE);
        existOrganization.setId(id);
@@ -202,16 +193,10 @@
            return dto;
        }

        //逻辑删除组织
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.eq("id", id);
        deleteWrapper.set("is_delete", Constants.DELETE);
        organizationMapper.update(null, deleteWrapper);

        //判断是否含有子组织
        List<Organization> children = getAllChildrenOrganization(existOrganization);
        if (!ObjectUtils.isEmpty(children)) {//如果含有子组织
            //判断是否删除所有子组织，如果不删除则所有子组织全部变为无父组织，孙子组织不变
        List<Organization> children = getAllChildrenOrganization(existOrganization.getId());
        if (!ObjectUtils.isEmpty(children)) {
            //判断是否删除所有子组织，如果不删除子组织则所有子组织全部变为无父组织，孙子组织不变
            UpdateWrapper updateWrapper = new UpdateWrapper();
            if (form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG)) {//删除所有子组织
                //获取所有子组织的id封装为集合
@@ -219,10 +204,22 @@
                children.forEach(value -> {
                    childrenId.add(value.getId());
                });
                //判断子组织是否含有站点，有一个子组织含有站点则不能删除
                for (Integer childId : childrenId) {
                    List<MonitorPoint> childMonitorPoints = monitorPointService.getMonitorPointsByOrganizationId(childId);
                    if(!ObjectUtils.isEmpty(childMonitorPoints)){
                        dto.setCode(ResponseCodeEnum.CHILDREN_ORGANIZATION_EXIST_MONITORPOINT.getCode());
                        dto.setMsg(ResponseCodeEnum.CHILDREN_ORGANIZATION_EXIST_MONITORPOINT.getMsg());
                        return dto;
                    }
                }
                //进行删除
                updateWrapper.in("id", childrenId);
                updateWrapper.set("is_delete", Constants.DELETE);
                organizationMapper.update(null, updateWrapper);
                //删除所有子组织账号
                childrenId.forEach(value->userService.deleteUsersByOrganizationId(value));

            } else {//不删除
                //提取所有直属子组织id
                List<Integer> childrenId = new ArrayList<>();
@@ -237,8 +234,16 @@
            }
        }

        //逻辑删除组织
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.eq("id", id);
        deleteWrapper.set("is_delete", Constants.DELETE);
        organizationMapper.update(null, deleteWrapper);

        //删除组织账号
        userService.deleteUsersByOrganizationId(id);

        //封装返回结果
        dto.setOrganization(existOrganization);
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        //操作插入日志
@@ -318,12 +323,22 @@
        Page<Organization> resultPage = organizationMapper.selectPage(page, queryWrapper);
        List<Organization> organizations = resultPage.getRecords();
        List<OrganizationDTO> organizationDTOS = new ArrayList<>();
        //查找所有组织的父组织并且封装organization到DTO中
        for (Organization child : organizations) {
        //查找所有组织的父组织和admin账号并且封装organization到DTO中
        for (Organization organization : organizations) {
            OrganizationDTO resultDto = new OrganizationDTO();
            Organization parent = organizationMapper.selectById(child.getParentId());//查找父组织
            resultDto.setOrganization(child);
            //查找父组织
            Organization parent = organizationMapper.selectById(organization.getParentId());
            resultDto.setOrganization(organization);
            resultDto.setParentOrganization(parent);
            //查找admin账号
            QueryWrapper userWrapper = new QueryWrapper();
            User adminUser = new User();
            adminUser.setIsAdmin(true);
            adminUser.setOrganizationId(organization.getId());
            adminUser.setIsDelete(Constants.NOT_DELETE);
            userWrapper.setEntity(adminUser);
            adminUser = userMapper.selectOne(userWrapper);
            resultDto.setAdminUser(adminUser);
            organizationDTOS.add(resultDto);
        }

@@ -331,31 +346,47 @@
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        dto.setOrganizationDTOS(organizationDTOS);
        dto.setCurrent(page.getCurrent());
        dto.setPage(page.getPages());
        dto.setPages(page.getPages());
        dto.setSize(page.getSize());
        dto.setTotal(page.getTotal());
        return dto;
    }

    /**
     * @Description: 查询所有组织的名称和Id，不做分页
     * @Param: [organizationQueryNameForm]
     * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO
     * @Author: 陈凯裕
     * @Date: 2021/4/13
     */
    * @Description: 如果form中id为空，则查询所有的组织
     *              如果id不为空，则查询该id和该id所有子组织之外的所有组织
            * @Param: [from]
            * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
            * @Author: 陈凯裕
            * @Date: 2021/5/7
            */
    @Override
    public OrganizationQueryNameDTO queryOrganizationNames(OrganizationQueryNameForm form) {
        OrganizationQueryNameDTO dto = new OrganizationQueryNameDTO();
    public OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm form) {
        OrganizationQueryNamesDTO dto = new OrganizationQueryNamesDTO();
        //取参
        String name = form.getName();
        Integer id = form.getId();
        //构造查询条件
        NullFilterWrapper<Organization> queryWrapper = new NullFilterWrapper();
        queryWrapper.like("name", name);
        QueryWrapper<Organization> queryWrapper = new QueryWrapper();
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);
        //查询
        //查询所有组织
        List<Organization> organizations = organizationMapper.selectList(queryWrapper);

        //判断form是否含有id,如果有则对其所有子组织进行过滤
        if(!ObjectUtils.isEmpty(id)){
            List<Organization> children = getAllChildrenOrganization(id);
            List<Integer> thisAndchildrenIds = new ArrayList<>();//该id以及其所有子组织的id集合
            thisAndchildrenIds.add(id);
            for (Organization child : children) {
                thisAndchildrenIds.add(child.getId());
            }
            organizations.removeIf(new Predicate<Organization>() {//过滤
                @Override
                public boolean test(Organization organization) {
                    if(thisAndchildrenIds.contains(organization.getId()))
                        return true;
                    return false;
                }
            });
        }
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -427,9 +458,9 @@
     * @Author: 陈凯裕
     * @Date: 2021/4/14
     */
    private List<Organization> getAllChildrenOrganization(Organization parent) {
    private List<Organization> getAllChildrenOrganization(Integer parentId) {
        List<Organization> children = new ArrayList<>();
        recursionQueryChildren(parent, children);
        recursionQueryChildren(parentId, children);
        return children;
    }

@@ -440,8 +471,7 @@
     * @Author: 陈凯裕
     * @Date: 2021/4/14
     */
    private void recursionQueryChildren(Organization parent, List<Organization> children) {
        Integer parentId = parent.getId();
    private void recursionQueryChildren(Integer parentId, List<Organization> children) {
        QueryWrapper<Organization> queryWrapper = new QueryWrapper();
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);
        queryWrapper.eq("parent_id", parentId);
@@ -449,7 +479,7 @@
        if (!ObjectUtils.isEmpty(organizations)) {
            children.addAll(organizations);
            for (Organization organization : organizations) {
                recursionQueryChildren(organization, children);
                recursionQueryChildren(organization.getId(), children);
            }
        } else {
            return;