456

Jinquan_Ou

2023-04-15 2bcbf32c439a5d7fbb20234b86e410347d5b806f

456

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java

@@ -44,7 +44,6 @@
        return zfPetService.selectPetList(zfPet, pageNum, pageSize);
    }


    /**
     * 导出魅宠记录列表
     */

 zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java

@@ -82,15 +82,21 @@
    /**
     * 饮食习惯
     */
    @Excel(name = "饮食习惯")
    @Excel(name = "饮食习惯(喜好)")
    private String eatHabit;

    /**
     * 生活习惯
     */
    @Excel(name = "生活习惯")
    @Excel(name = "生活习惯(喜好)")
    private String lifeHabit;

    @Excel(name = "饮食习惯(厌恶)")
    private String disEatHabit;

    @Excel(name = "生活习惯(厌恶)")
    private String disLifeHabit;

    /**
     * 犬居住地址
     */

 zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java

@@ -65,6 +65,11 @@
    private String url;

    /**
     * 本条数据所属于的家庭
     */
    private String familyId;

    /**
     * 是否是本家庭的数据(0:不是,1:是)
     */
    private Integer ownData = 0;

 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java

@@ -84,24 +84,7 @@
                //逗号隔开得到如下串：3{2007 2018 2015}
                String[] authorityList = secondFamilyAuthority.split(",");
                for (String authorityAndId : authorityList) {

                    //得到权限串
                    String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);

                    if (authorities.contains(" ")) {
                        //空格隔开得到菜单id，看是否有对应的权限
                        String[] authorityIdList = authorities.split(" ");
                        for (String s : authorityIdList) {
                            if (s.equals(PROPERTY_LIST)) {
                                secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
                                break;
                            }
                        }
                    } else {
                        if (authorities.equals(PROPERTY_LIST)) {
                            secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
                        }
                    }
                    setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId);
                }

                //把后面的逗号去掉
@@ -110,31 +93,15 @@
                }

            }else{
                String authorities = secondFamilyAuthority.substring(2, secondFamilyAuthority.length() - 1);
                if (authorities.contains(" ")) {
                    //空格隔开得到菜单id，看是否有对应的权限
                    String[] authorityIdList = authorities.split(" ");
                    for (String s : authorityIdList) {
                        if (s.equals(PROPERTY_LIST)) {
                            secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
                            break;
                        }
                    }
                } else {
                    if (authorities.equals(PROPERTY_LIST)) {
                        secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
                    }
                }
                setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
                //把后面的逗号去掉
                if (secondFamilyIdsBuffer.length() > 1) {
                    secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
                }
            }

        }
        //将StringBuffer转成String
        String secondFamilyIds = secondFamilyIdsBuffer.toString();


        //第一家庭号的条件
        if (familyIds.contains(",")) {
@@ -183,6 +150,25 @@
        return lqw;
    }

    private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) {
        //得到权限串
        String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);

        if (authorities.contains(" ")) {
            //空格隔开得到菜单id，看是否有对应的权限
            String[] authorityIdList = authorities.split(" ");
            for (String s : authorityIdList) {
                if (s.equals(PROPERTY_LIST)) {
                    secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
                    break;
                }
            }
        } else {
            if (authorities.equals(PROPERTY_LIST)) {
                secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
            }
        }
    }

    private ZInfoUser getMySelf() {
        SysUser user = SecurityUtils.getLoginUser().getUser();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java

@@ -31,6 +31,7 @@
    @Override
    public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor);
        lqw.orderByDesc(ZfDoctor::getId);

        Page<ZfDoctor> ZfDoctorPage = new Page<>(pageNum,pageSize);
        Page<ZfDoctor> pageResult = page(ZfDoctorPage, lqw);

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java

@@ -32,6 +32,7 @@
    @Override
    public AjaxResult selectPetList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
        lqw.orderByDesc(ZfPet::getId);
        Page<ZfPet> ZfPetPage = new Page<>(pageNum,pageSize);
        Page<ZfPet> pageResult = page(ZfPetPage, lqw);
        HashMap<String, Object> data = MapUtils.getResult(pageResult);
@@ -60,6 +61,8 @@
        lqw.like(StringUtils.isNotEmpty(zfPet.getLifeHabit()),ZfPet::getLifeHabit,zfPet.getLifeHabit());
        lqw.like(StringUtils.isNotEmpty(zfPet.getAddress()),ZfPet::getAddress,zfPet.getAddress());
        lqw.like(StringUtils.isNotEmpty(zfPet.getDialect()),ZfPet::getDialect,zfPet.getDialect());
        lqw.like(StringUtils.isNotEmpty(zfPet.getDisEatHabit()),ZfPet::getDisEatHabit,zfPet.getDisEatHabit());
        lqw.like(StringUtils.isNotEmpty(zfPet.getDisLifeHabit()),ZfPet::getDisLifeHabit,zfPet.getDisLifeHabit());
        return lqw;
    }
}