888
Jinquan_Ou
2023-04-17 8e3f58c38fd3d552125ada6afdf88e7fc2b380a0
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -12,13 +12,13 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
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.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -38,21 +38,15 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
    @Resource
    ZInfoUserService zInfoUserService;
    @Resource
    IZfPropertyService zfPropertyService;
    @Override
    public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
        String familyIds = listFamilyIds();
        String secondFamilyIds = listSecondFamilyIds();
        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds);
        List<ZfProperty> list = list(lambdaQueryWrapper);
        log.info("返回的数据为:{}", list);
        return list;
    }
    @Resource
    ZInfoUserService zInfoUserService;
    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
@@ -189,6 +183,34 @@
    }
    @Override
        public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
        String familyIds = listFamilyIds();
        String secondFamilyIds = listSecondFamilyIds();
        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds);
        List<ZfProperty> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyIds, beanRecords);
    }
    private static List<ZfProperty> markOwnData(String familyIds, List<ZfProperty> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();
            if (familyIds.contains(",")) {
                String[] familyIdList = familyIds.split(",");
                for (String familyId : familyIdList) {
                    if (familyId.equals(recordFamilyId)) {
                        record.setOwnData(1);
                    }
                }
            } else {
                if (familyIds.equals(recordFamilyId)) {
                    record.setOwnData(1);
                }
            }
        }).collect(Collectors.toList());
    }
    @Override
    public AjaxResult selectPropertyList(ZfProperty zfProperty, Integer pageNum, Integer pageSize) {
        String familyIds = listFamilyIds();
        String secondFamilyAuthority = listSecondFamilyIds();
@@ -199,32 +221,14 @@
        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());
        List<ZfProperty> dtoResult = markOwnData(familyIds, beanRecords);
        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
    }
    @Override
    public int addProperty(ZfProperty zfProperty) {
    public AjaxResult addData(ZfProperty zfProperty) {
        String familyIds = listFamilyIds();
        boolean flag = false;//判断当前用户的id是否有权加入当前家庭id的对象
@@ -241,14 +245,49 @@
            }
        }
        if (flag) {
            boolean save = save(zfProperty);
            return save ? 1 : 0;
            if (save(zfProperty)) {
                return AjaxResult.success();
            }else {
                return AjaxResult.error();
            }
        } else {
            throw new RuntimeException("你没有操作该家庭号为" + zfProperty.getFamilyId() + "数据的权限");
        }
    }
    @Override
    public AjaxResult addData2(ZfProperty zfProperty){
        ZInfoUser mySelf = getMySelf();
        String myFamilyId = mySelf.getFamilyId();
        if (StringUtils.isNotEmpty(zfProperty.getFamilyId())){
            throw new RuntimeException("导入数据时您不能指定家庭号");
        }
        if(StringUtils.isEmpty(myFamilyId)){
            throw new RuntimeException("您还未加入任何家庭");
        }
        if (myFamilyId.contains(",")){
            String[] myFamilyIds = myFamilyId.split(",");
            //默认添加第一个家庭的数据
            zfProperty.setFamilyId(myFamilyIds[0]);
        }else {
            zfProperty.setFamilyId(myFamilyId);
        }
        if (save(zfProperty)) {
            return AjaxResult.success();
        }else {
            return AjaxResult.error();
        }
    }
    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {
        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
        List<ZfProperty> propertyList = null;
@@ -260,7 +299,7 @@
        log.info("资产列表为:{}", propertyList);
        for (ZfProperty zfProperty : propertyList) {
            zfPropertyService.addProperty(zfProperty);
            zfPropertyService.addData2(zfProperty);
        }
        return AjaxResult.success("导入数据成功");