包机组修改

whyclxw

2025-05-15 15216343d7a91bd0990f97a13bdf6eb51c390126

包机组修改

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

@@ -43,7 +43,7 @@
    public void insertNeiZhi(Integer baojiId){
        List<BaojigroupUsr> list=new ArrayList<>();
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.lt("uid",99);
        wrapper.lt("id",99);
        List<User> uList=UserMapper.selectList(wrapper);
        for (User uinf:uList) {
            BaojigroupUsr baojiusr=new BaojigroupUsr();
@@ -59,7 +59,7 @@
        //验证包机组名是否重复
        //将内置用户加入到包机组下
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("baoji_name",baojiName);
        wrapper.eq("baoji_group_name",baojiName);
        wrapper.last("limit 1");
        Baojigroup baoji=mapper.selectOne(wrapper);
        if(baoji!=null){
@@ -68,14 +68,14 @@
            baoji=new Baojigroup();
            baoji.setBaojiGroupName(baojiName);
            int bl=mapper.insert(baoji);
            if(bl>0){
            /*if(bl>0){
                //将内置用户加入到包机组下
                QueryWrapper wrapper1=new QueryWrapper();
                wrapper1.eq("baoji_name",baojiName);
                wrapper1.eq("baoji_group_name",baojiName);
                wrapper1.last("limit 1");
                baoji=mapper.selectOne(wrapper1);
                insertNeiZhi(baoji.getBaojiGroupId());
            }
            }*/
            return new Response().set(1,bl>0,"添加包机组成功");
        }

@@ -83,8 +83,8 @@
    //编辑包机组
    public Response updateBaoji(Integer id, String baojiName) {
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("id",id);
        wrapper.set("baoji_name",baojiName);
        wrapper.eq("baoji_group_id",id);
        wrapper.set("baoji_group_name",baojiName);
        int bl=mapper.update((Baojigroup) ActionUtil.objeNull,wrapper);
        return new Response().set(1,bl>0,"编辑包机组成功");
    }
@@ -93,22 +93,22 @@
    public Response delBaoji(Integer id) {
        //先删除包机组对应人下的记录
        UpdateWrapper wrapper1=new UpdateWrapper();
        wrapper1.eq("baoji_id",id);
        wrapper1.eq("baoji_group_id",id);
        bjUsrmapper.delete(wrapper1);
        //再删除包机组对应下的机房和锁
        //再删除包机组对应下的机房和电源
        UpdateWrapper wrapper2=new UpdateWrapper();
        wrapper2.eq("baoji_id",id);
        wrapper2.eq("baoji_group_id",id);
        bjPowermapper.delete(wrapper2);
        //最后删除包机组
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("id",id);
        wrapper.eq("baoji_group_id",id);
        int bl=mapper.delete(wrapper);
        return new Response().set(1,bl>0,"删除包机组成功");
    }
    //查询包机组及包机组对应的用户和对应机房和锁
    public Response getAllBaojiInf() {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.orderByAsc("id");
        wrapper.orderByAsc("baoji_group_id");
        List<Baojigroup> baojiList=mapper.selectList(wrapper);
        for (Baojigroup bj:baojiList) {
            //查询包机组对应的用户信息
@@ -150,8 +150,8 @@
        List<User> relatedUserList = bjUsrmapper.getUserList(id);
        //查询包机组未添加的用户信息
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.select("uid", "uname");
        wrapper.gt("uid",100);
        wrapper.select("id", "name");
        wrapper.gt("id",100);
        List<User> allUserList = UserMapper.selectList(wrapper);
        List<User> notRelatedUserList = allUserList.stream().filter(User -> !relatedUserList.contains(User)).collect(Collectors.toList());

@@ -177,7 +177,7 @@
    public Response getBaojiUserByUid(Integer uid) {
        //查询当前人所在包机组
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.select("baoji_id");
        wrapper.select("baoji_group_id");
        if(uid>100){
            wrapper.eq("uid",uid);
        }
@@ -199,6 +199,6 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("uid",id);
        List<BaojigroupUsr> list=bjUsrmapper.selectList(wrapper);
        return list.size()>0?0:1 ;
        return list.size()>0?1:0 ;
    }
}

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

@@ -64,6 +64,15 @@
            addsinf.setStationId(stationId);
            sinfMapper.insert(addsinf);
        }
        //判断机房是否存在
        QueryWrapper wrapper1=new QueryWrapper();
        wrapper1.eq("power_name",addpinf.getPowerName());
        wrapper1.eq("station_id",stationId);
        wrapper1.last("limit 1");
        PowerInf juegep=mapper.selectOne(wrapper);
        if(juegep==null){
            return new Response().set(1, false, "当前机房下已添加过该电源");
        }
            //再添加电源信息
            addpinf.setStationId(stationId);
            //获取对应的电源id

 src/main/java/com/whyc/util/ActionUtil.java

@@ -201,8 +201,8 @@
        Object obj=session.getAttribute("user");
        User userInf = new User();
        if(obj==null){
            userInf.setName("unlogged_user");
            userInf.setId(99);
            userInf.setName("hw");
            userInf.setId(1005);
        }else{
            userInf=(User) session.getAttribute("user");
        }