审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

 src/main/java/com/whyc/service/PermitGroupService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.mapper.CommonMapper;
import com.whyc.mapper.PermitGroupMapper;
import com.whyc.mapper.PermitGroupUserMapper;
@@ -10,15 +11,12 @@
import com.whyc.pojo.PermitGroup;
import com.whyc.pojo.PermitGroupUser;
import com.whyc.pojo.UserInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;

import javax.annotation.Resource;
import java.sql.Wrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -37,25 +35,80 @@
    @Resource
    private UserInfMapper userInfMapper;

    public void add(List<PermitGroup> permitGroupList) {
    @Autowired
    private UserService userService;

    @Transactional
    public Response<Boolean> add(List<PermitGroup> permitGroupList) {
        Response<Boolean> response = new Response();
        //权限互斥,查询已存在的权限组,不允许存在权限完全一样的权限组
        QueryWrapper<PermitGroup> wrapper = Wrappers.query();
        //wrapper.select("permit_group_id","permit_item_name","permit_item_value");
        wrapper.select("permit_group_id","permit_item_value");
        List<PermitGroup> existGroupList = mapper.selectList(wrapper);
        Map<Integer, List<PermitGroup>> existGroupListMap = existGroupList.stream().collect(Collectors.groupingBy(PermitGroup::getPermitGroupId));
        Set<Integer> keySet = existGroupListMap.keySet();
        Iterator<Integer> iterator = keySet.iterator();
        while (iterator.hasNext()){
            boolean diff = false;
            List<PermitGroup> existGroupListII = existGroupListMap.get(iterator.next());
            for (int i = 0; i < existGroupListII.size(); i++) {
                if(!permitGroupList.get(i).getPermitItemValue().equals(existGroupListII.get(i).getPermitItemValue())){
                    //存在差异,进入下个组校验
                    diff = true;
                    break;
                }
            }
            //如果每项都不存在差异
            if(!diff){
                return response.set(1,false,"有存在权限完全相同的权限组,无法添加");
            }
        }
        //权限组id生成
        int maxValue = (int) commonMapper.getMaxValue("db_user", "tb_user_permitgroup", "permit_group_id");
        int newPermitGroupId = maxValue+1;
        permitGroupList.stream().forEach(permitGroup -> permitGroup.setPermitGroupId(newPermitGroupId));
        mapper.insertBatchSomeColumn(permitGroupList);
        return response.set(1,true,"添加成功");
    }


    public void update(List<PermitGroup> permitGroupList) {
    @Transactional
    public Response<Boolean> update(List<PermitGroup> permitGroupList) {
        Response<Boolean> response = new Response<>();
        //权限互斥,查询已存在的权限组,不允许存在权限完全一样的权限组
        QueryWrapper<PermitGroup> wrapper = Wrappers.query();
        //wrapper.select("permit_group_id","permit_item_name","permit_item_value");
        wrapper.select("permit_group_id","permit_item_value");
        List<PermitGroup> existGroupList = mapper.selectList(wrapper);
        Map<Integer, List<PermitGroup>> existGroupListMap = existGroupList.stream().collect(Collectors.groupingBy(PermitGroup::getPermitGroupId));
        Set<Integer> keySet = existGroupListMap.keySet();
        Iterator<Integer> iterator = keySet.iterator();
        while (iterator.hasNext()){
            boolean diff = false;
            List<PermitGroup> existGroupListII = existGroupListMap.get(iterator.next());
            for (int i = 0; i < existGroupListII.size(); i++) {
                if(!permitGroupList.get(i).getPermitItemValue().equals(existGroupListII.get(i).getPermitItemValue())){
                    //存在差异,进入下个组校验
                    diff = true;
                    break;
                }
            }
            //如果每项都不存在差异
            if(!diff){
                return response.set(1,false,"有存在权限完全相同的权限组,无法更新");
            }
        }
        //先删除,后增加
        UpdateWrapper<PermitGroup> wrapper = Wrappers.update();
        UpdateWrapper<PermitGroup> updateWrapper = Wrappers.update();
        wrapper.eq("permit_group_id",permitGroupList.get(0).getPermitGroupId());
        mapper.delete(wrapper);

        mapper.insertBatchSomeColumn(permitGroupList);
        return response.set(1,true,"更新成功");
    }


    @Transactional
    public void delete(Integer permitGroupId) {
        //删除权限组表记录
        UpdateWrapper<PermitGroup> groupWrapper = Wrappers.update();
@@ -79,8 +132,10 @@
        //查询权限组已添加的用户
        List<UserInf> relatedUserInfList = permitGroupUserMapper.getUserInf(permitGroupId);
        //查询权限组未添加的用户
        List<UserInf> allUserInfList = userInfMapper.selectList(null);
        List<UserInf> notRelatedUserInfList = allUserInfList.stream().filter(userInf -> !relatedUserInfList.contains(userInf)).collect(Collectors.toList());
        //List<UserInf> allUserInfList = userInfMapper.selectList(null);
        //List<UserInf> notRelatedUserInfList = allUserInfList.stream().filter(userInf -> !relatedUserInfList.contains(userInf)).collect(Collectors.toList());
        //查询未被添加到所有权限组的用户
        List<UserInf> notRelatedUserInfList = userService.searchCS_All2();
        //查询权限组的明细权限
        QueryWrapper<PermitGroup> wrapper = Wrappers.query();
        wrapper.eq("permit_group_id",permitGroupId);