Jinquan_Ou
2023-04-12 a64372663b31715ccbb1048eb03deb172dad2773
做了家庭资产的查询权限
5个文件已修改
3个文件已添加
315 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/constant/MenuAuthority.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java 150 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/util/ArraysUtil.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -40,12 +40,10 @@
    @GetMapping("/all")
    public AjaxResult  listAll(ZfProperty zfProperty){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
    }
    /**
     * 导出家庭资产记录列表
ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java
@@ -19,4 +19,13 @@
        data.put("pageSize",pageResult.getSize());
        return data;
    }
    public static HashMap<String,Object> getResult(Page pageResult,Object record){
        HashMap<String, Object> data = new HashMap<>();
        data.put("data",record);
        data.put("total",pageResult.getTotal());
        data.put("pageNum",pageResult.getCurrent());
        data.put("pageSize",pageResult.getSize());
        return data;
    }
}
zhang-content/src/main/java/com/ruoyi/constant/MenuAuthority.java
New file
@@ -0,0 +1,13 @@
package com.ruoyi.constant;
/**
 * @Author Jinquan_Ou
 * @Description
 * @Date 2023-04-12 23:08
 * @Version 1.0.0
 **/
public class MenuAuthority {
    public static final String PROPERTY_LIST="2007";
}
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -161,5 +161,10 @@
     */
    private String familyId;
    /**
     * 其他家庭授权id
     */
    private String secondFamilyId;
}
zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -68,4 +68,5 @@
    @Excel(name="家庭编号")
    private String familyId;
}
zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java
New file
@@ -0,0 +1,73 @@
package com.ruoyi.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @Author Jinquan_Ou
 * @Description
 * @Date 2023-04-12 20:54
 * @Version 1.0.0
 **/
@Data
public class ZfPropertyDto implements Serializable {
    private static final long serialVersionUID = 1L;
    private Integer id;
    /**
     * 资产类型
     */
    private String type;
    /**
     * 标题(账号、卡号)
     */
    private String title;
    /**
     * 开户行(资产地址)
     */
    private String location;
    /**
     * 持有人名字
     */
    private String holder;
    /**
     * 存放地址
     */
    private String address;
    private String remark;
    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;
    private String url;
    /**
     * 是否是本家庭的数据(0:不是,1:是)
     */
    private Integer ownData = 0;
}
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -8,28 +8,25 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.dto.ZfPropertyDto;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST;
/**
@@ -50,7 +47,8 @@
    @Override
    public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
        String familyIds = listFamilyIds();
        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds);
        String secondFamilyIds = listSecondFamilyIds();
        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds);
        List<ZfProperty> list = list(lambdaQueryWrapper);
        log.info("返回的数据为:{}", list);
        return list;
@@ -69,35 +67,155 @@
        return lqw;
    }
    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty, String familyIds) {
    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty, String familyIds, String secondFamilyAuthority) {
        //模糊查询的条件
        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
        //定义一个布尔标记,标记第一家庭号是否有逗号
        boolean flag = false;
        StringBuilder secondFamilyIdsBuffer = new StringBuilder();
        //处理传入的secondFamilyAuthority   3{2007 2018 2015},4{2007 2019}
        if (StringUtils.isNotEmpty(secondFamilyAuthority)) {
            if (secondFamilyAuthority.contains(",")) {
                //逗号隔开得到如下串: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(",");
                        }
                    }
                }
                //把后面的逗号去掉
                if (secondFamilyIdsBuffer.length() > 1) {
                    secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
                }
            }
        }
        //将StringBuffer转成String
        String secondFamilyIds = secondFamilyIdsBuffer.toString();
        //第一家庭号的条件
        if (familyIds.contains(",")) {
            flag = true;
        }
        //第二家庭号的条件
        if (StringUtils.isNotEmpty(secondFamilyIds)) {
            if (secondFamilyIds.contains(",")) {
                String[] secondFamilyIdList = secondFamilyIds.split(",");
                if (flag) {
                    //如果第一家庭号和第二家庭号都有逗号
                    String[] familyList = familyIds.split(",");
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIdList);
                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
                } else {
                    //如果第一家庭号没有逗号但是第二家庭号有逗号
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
                }
            } else {
                if (flag) {
                    //如果第一家庭号有逗号但第二家庭号没有逗号
                    String[] familyList = familyIds.split(",");
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
                } else {
                    //如果第一家庭号和第二家庭号都没有逗号
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
                }
            }
        } else {
            //如果没有第二家庭号
            if (flag) {
            String[] familyList = familyIds.split(",");
            lqw.in(ZfProperty::getFamilyId,familyList);
        } else {
            lqw.eq(ZfProperty::getFamilyId, familyIds);
        }
        }
        lqw.orderByDesc(ZfProperty::getId);
        return lqw;
    }
    private String listFamilyIds() {
    private ZInfoUser getMySelf() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
        ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
        return zInfoUser.getFamilyId();
        return zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
    }
    private String listFamilyIds() {
        ZInfoUser mySelf = getMySelf();
        return mySelf.getFamilyId();
    }
    private String listSecondFamilyIds() {
        ZInfoUser mySelf = getMySelf();
        return mySelf.getSecondFamilyId();
    }
    @Override
    public AjaxResult selectPropertyList(ZfProperty zfProperty, Integer pageNum, Integer pageSize) {
        String familyIds = listFamilyIds();
        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, familyIds);
        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, familyIds, secondFamilyAuthority);
        Page<ZfProperty> zfPropertyPage = new Page<>(pageNum, pageSize);
        Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
        HashMap<String, Object> data = MapUtils.getResult(pageResult);
        return AjaxResult.success(data);
        List<ZfProperty> beanRecords = pageResult.getRecords();//得到查询出来的数据
        List<ZfPropertyDto> dtoResult = beanRecords.stream().map(record -> {
            String recordFamilyId = record.getFamilyId();
            ZfPropertyDto zfPropertyDto = new ZfPropertyDto();
            BeanUtils.copyProperties(record, zfPropertyDto);
            if (familyIds.contains(",")) {
                String[] familyIdList = familyIds.split(",");
                for (String familyId : familyIdList) {
                    if (familyId.equals(recordFamilyId)) {
                        zfPropertyDto.setOwnData(1);
                    }
                }
            } else {
                if (familyIds.equals(recordFamilyId)) {
                    zfPropertyDto.setOwnData(1);
                }
            }
            return zfPropertyDto;
        }).collect(Collectors.toList());
        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
    }
    @Override
zhang-content/src/main/java/com/ruoyi/util/ArraysUtil.java
New file
@@ -0,0 +1,62 @@
package com.ruoyi.util;
/**
 * @Author Jinquan_Ou
 * @Description
 * @Date 2023-04-12 23:06
 * @Version 1.0.0
 **/
public class ArraysUtil {
    /**
     * 两个字符组成一个数组
     *
     * @param str1 字符一
     * @param str2 字符二
     * @return 结果数组
     */
    public static String[] appendToArray(String str1, String str2) {
        String[] newArray = new String[2];
        newArray[0] = str1;
        newArray[1] = str2;
        return newArray;
    }
    /**
     * 添加单个字符到字符串数组里,返回一个新的数组
     *
     * @param array
     * @param str
     * @return
     */
    public static String[] appendToArray(String[] array, String str) {
        String[] newArray = new String[array.length + 1];
        for (int i = 0; i < array.length; i++) {
            newArray[i] = array[i];
        }
        newArray[newArray.length - 1] = str;
        return newArray;
    }
    /**
     * 将两个数组合并为一个数组返回
     *
     * @param array1 数组1
     * @param array2 数组2
     * @return 新数组
     */
    public static String[] appendToArray(String[] array1, String[] array2) {
        String[] newArray = new String[array1.length + array2.length];
        int index = 0;
        for (int i = 0; i < array1.length; i++) {
            newArray[index] = array1[i];
            index++;
        }
        for (int i = 0; i < array2.length; i++) {
            newArray[index] = array2[i];
            index++;
        }
        return newArray;
    }
}