screen-manage 添加分配组织admin账号菜单功能

kaiyu

2021-05-11 141fd8d80cdcf9602dce31a138d82d202d82820e

screen-manage
                   添加分配组织admin账号菜单功能

 screen-api/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java

@@ -27,7 +27,7 @@
    private String sessionTimeout;
    @Value("${kafka.consumer.auto.commit.interval}")
    private String autoCommitInterval;
    @Value("${kafka.consumer.group.id}")
    @Value("${kafka.consumer.groupMenu.id}")
    private String groupId;
    @Value("${kafka.consumer.auto.offset.reset}")
    private String autoOffsetReset;

 screen-api/src/main/java/com/moral/api/entity/Group.java

@@ -22,7 +22,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("`group`")
@TableName("`groupMenu`")
public class Group extends Model<Group> {

    private static final long serialVersionUID = 1L;

 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java

@@ -46,7 +46,8 @@
    USER_EXIST(-32,"用户已经存在"),
    ORGANIZATION_USER_EXIST(-33,"组织已经存在用户"),
    SENSOR_IS_EXIST(-34, "因子已存在"),
    SENSOR_KEY_IS_EXIST(-35, "因子编码已被使用")
    SENSOR_KEY_IS_EXIST(-35, "因子编码已被使用"),
    ORGANIZATION_USER_NOT_EXIST(-36,"组织账号不存在")
    ;
    private final Integer code;
    private final String  msg;

 screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java

@@ -27,7 +27,7 @@
    private String sessionTimeout;
    @Value("${kafka.consumer.auto.commit.interval}")
    private String autoCommitInterval;
    @Value("${kafka.consumer.group.id}")
    @Value("${kafka.consumer.groupMenu.id}")
    private String groupId;
    @Value("${kafka.consumer.auto.offset.reset}")
    private String autoOffsetReset;

 screen-manage/src/main/java/com/moral/api/controller/GroupController.java

File was deleted

 screen-manage/src/main/java/com/moral/api/controller/GroupMenuController.java

New file
@@ -0,0 +1,51 @@
package com.moral.api.controller;

import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;
import com.moral.api.service.GroupMenuService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * @ClassName GroupMenuController
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/5/11 10:16
 * @Version TODO
 **/
@Slf4j
@Api(tags = {"前台角色菜单管理"})
@RestController
@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/groupMenu")
public class GroupMenuController {

    @Autowired
    GroupMenuService groupMenuService;

    /**
    * @Description: 给admin角色分配前台菜单
            * @Param: [GroupMenuUpdateForm form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/5/11
            */
    @PostMapping("update")
    public ResultMessage update(@RequestBody GroupMenuUpdateForm form) {

        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        //处理分配业务
        GroupMenuDTO dto = groupMenuService.updateGroupMenu(form);

        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

}

 screen-manage/src/main/java/com/moral/api/entity/Group.java

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -43,12 +45,12 @@
    /**
     * 创建时间
     */
    private LocalDateTime createTime;
    private Date createTime;

    /**
     * 更新时间
     */
    private LocalDateTime updateTime;
    private Date updateTime;

    /**
     * 是否删除

 screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java

@@ -1,10 +1,13 @@
package com.moral.api.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -18,6 +21,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("`group_menu`")
public class GroupMenu extends Model<GroupMenu> {

    private static final long serialVersionUID = 1L;
@@ -51,12 +55,12 @@
    /**
     * 创建时间
     */
    private LocalDateTime createTime;
    private Date createTime;

    /**
     * 更新时间
     */
    private LocalDateTime updateTime;
    private Date updateTime;

    /**
     * 是否删除

 screen-manage/src/main/java/com/moral/api/pojo/dto/groupMenu/GroupMenuDTO.java

New file
@@ -0,0 +1,21 @@
package com.moral.api.pojo.dto.groupMenu;

import com.moral.api.entity.GroupMenu;
import lombok.Data;

/**
 * @ClassName GroupMenuDTO
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/5/11 13:37
 * @Version TODO
 **/
@Data
public class GroupMenuDTO {

    private Integer code;

    private String msg;

    private GroupMenu groupMenu;
}

 screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java

File was deleted

 screen-manage/src/main/java/com/moral/api/pojo/form/groupMenu/GroupMenuUpdateForm.java

New file
@@ -0,0 +1,29 @@
package com.moral.api.pojo.form.groupMenu;

import lombok.Data;
import org.springframework.util.ObjectUtils;

import java.util.List;

/**
 * @ClassName GroupUpdateForm
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/5/11 10:25
 * @Version TODO
 **/
@Data
public class GroupMenuUpdateForm {

    private Integer organizationId;

    private Integer channel;

    private List<Integer> menuIds;

    public boolean valid(){
        if(ObjectUtils.isEmpty(organizationId)||ObjectUtils.isEmpty(channel)||null==menuIds)
            return false;
        return true;
    }
}

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

@@ -2,6 +2,8 @@

import com.moral.api.entity.GroupMenu;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;

/**
 * <p>
@@ -13,4 +15,6 @@
 */
public interface GroupMenuService extends IService<GroupMenu> {

    public GroupMenuDTO updateGroupMenu(GroupMenuUpdateForm form);

}

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

@@ -1,10 +1,23 @@
package com.moral.api.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.List;

/**
 * <p>
@@ -17,4 +30,50 @@
@Service
public class GroupMenuServiceImpl extends ServiceImpl<GroupMenuMapper, GroupMenu> implements GroupMenuService {

    @Autowired
    GroupMenuMapper groupMenuMapper;
    @Autowired
    GroupMapper groupMapper;

    @Override
    @Transactional
    public GroupMenuDTO updateGroupMenu(GroupMenuUpdateForm form) {
        //创建返回对象
        GroupMenuDTO dto = new GroupMenuDTO();
        //取参
        Integer orgId = form.getOrganizationId();
        Integer channel = form.getChannel();
        List<Integer> insertMenuIds = form.getMenuIds();
        //根据orgId查询组织admin角色id
        QueryWrapper<Group> queryGroupWrapper = new QueryWrapper<>();
        Group groupConditon = new Group();
        groupConditon.setOrganizationId(orgId);
        groupConditon.setGroupName("admin");
        groupConditon.setIsDelete(Constants.NOT_DELETE);
        queryGroupWrapper.setEntity(groupConditon);
        Group group = groupMapper.selectOne(queryGroupWrapper);
        if(ObjectUtils.isEmpty(group)){//如果没有角色则证明组织还没有账号
            dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getMsg());
            return dto;
        }
        //删除角色当前所有的菜单
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.set("is_delete",Constants.DELETE);
        deleteWrapper.eq("group_id",group.getId());
        groupMenuMapper.update(null,deleteWrapper);
        //重新添加
        for (Integer menuId : insertMenuIds) {
            GroupMenu groupMenu = new GroupMenu();
            groupMenu.setChannel(channel);
            groupMenu.setGroupId(group.getId());
            groupMenu.setMenuId(menuId);
            groupMenu.setOrganizationId(orgId);
            groupMenuMapper.insert(groupMenu);
        }
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }
}

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

@@ -281,7 +281,7 @@
        deleteUserGroupWrapper.eq("organization_id",organizationId);
        deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
        userGroupMapper.update(null,deleteUserGroupWrapper);
        //逻辑删除，group
        //逻辑删除，groupMenu
        UpdateWrapper deleteGroupWrapper = new UpdateWrapper();
        deleteGroupWrapper.eq("organization_id",organizationId);
        deleteGroupWrapper.set("is_delete", Constants.DELETE);