From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期五, 25 十月 2024 23:11:30 +0800 Subject: [PATCH] 修改了bug --- zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 67 ++++++++++++++++++++++++++++++--- 1 files changed, 61 insertions(+), 6 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java index ef7944f..05ceaf2 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; + import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -62,6 +64,12 @@ @Resource RestHighLevelClient restHighLevelClient; + + @Resource + private IZfPropertyDownloadService zfPropertyDownloadService; + + @Resource + private IZfPropertyShareService iZfPropertyShareService; // private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) { @@ -222,17 +230,31 @@ //瑕佹煡鑷繁瀹跺涵鐨� ZInfoUser myself = zInfoUserService.getMyself(); Long familyId = myself.getFamilyId(); + + //鏌ョ湅鐖舵瘝瀹跺涵鐨勬暟鎹� + Long fatherFaId = 0L; + if(myself.getFatherId()!=null) + fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); + Long motherFaId = 0L; + if(myself.getMomId()!=null) + motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId(); + //涔熻鏌ュ埆浜烘巿鏉冪殑 List<ZAuthority> authority = zAuthorityService.getAuthority(); List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(PROPERTY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList()); //鍔犱笂鑷繁瀹跺涵鐨刬d idList.add(familyId); + + //鍔犱笂鐖舵瘝瀹舵棌id + idList.add(fatherFaId); + idList.add(motherFaId); + // String familyIds = listFamilyIds(); // String secondFamilyAuthority = listSecondFamilyIds(); LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList); List<ZfProperty> beanRecords = list(lqw); log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords); - return markOwnData(familyId, beanRecords); + return markOwnData(familyId, fatherFaId, motherFaId, beanRecords); } // private static List<ZfProperty> markOwnData(String familyIds, List<ZfProperty> beanRecords) { @@ -258,12 +280,31 @@ //瑕佹煡鑷繁瀹跺涵鐨� ZInfoUser myself = zInfoUserService.getMyself(); + if(myself==null) + { + // System.out.println("ssssss"); + return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�"); + } Long familyId = myself.getFamilyId(); //涔熻鏌ュ埆浜烘巿鏉冪殑 List<ZAuthority> authority = zAuthorityService.getAuthority(); List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(PROPERTY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList()); + + //鏌ョ湅鐖舵瘝鐨勬暟鎹細 + Long fatherFaId = 0L; + if(myself.getFatherId()!=null) + fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId(); + Long motherFaId = 0L; + if(myself.getMomId()!=null) + motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId(); + //鍔犱笂鑷繁瀹跺涵鐨刬d idList.add(familyId); + + //鍔犱笂鐖舵瘝瀹舵棌id + idList.add(fatherFaId); + idList.add(motherFaId); + // String familyIds = listFamilyIds(); // String secondFamilyAuthority = listSecondFamilyIds(); LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList); @@ -273,16 +314,16 @@ List<ZfProperty> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹� - List<ZfProperty> dtoResult = markOwnData(familyId, beanRecords); + List<ZfProperty> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords); HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult); return AjaxResult.success(data); } - public List<ZfProperty> markOwnData(Long familyId,List<ZfProperty> beanRecords){ + public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> beanRecords){ return beanRecords.stream().peek( bean -> { - if (bean.getFamilyId() == familyId) { + if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) { bean.setOwnData(1); } else { bean.setOwnData(0); @@ -299,6 +340,12 @@ else list = list(); return list; + } + + @Override + public AjaxResult selectType() { + List<String> lis = list(new QueryWrapper<ZfProperty>().select("distinct (type)").lambda()).stream().map(ZfProperty::getType).collect(Collectors.toList()); + return AjaxResult.success(lis); } @Override @@ -416,8 +463,9 @@ @Override public AjaxResult updateData(ZfProperty zfProperty) { ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); - System.out.println("sssssssssssss"); + // System.out.println("sssssssssssss"); //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔 Long dataFamilyId = getById(zfProperty.getId()).getFamilyId(); @@ -525,18 +573,25 @@ List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids)); + if (! (zfPropertyDownloadService.deleteData(ids) && iZfPropertyShareService.deleteByContentId(ids) ) ){ + return AjaxResult.error(); + } if (zfPropertyService.removeByIds(Arrays.asList(ids))) { //鍒犻櫎es涓殑鏁版嵁 zfPropertys.stream().forEach(zfProperty -> { EsModel esModel = esService.findByCtId(zfProperty.getId().intValue(), "瀹跺涵璧勪骇"); + if(esModel!=null) + { DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId()); try { restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT); } catch (IOException e) { throw new RuntimeException(e); - } + }} }); + System.out.println("15165132165346153246153"); + return AjaxResult.success(); }else { return AjaxResult.error(); -- Gitblit v1.9.1