ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -8,8 +8,10 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.MemoBook; import com.ruoyi.domain.ZProperty; import com.ruoyi.domain.ZfEconomy; import com.ruoyi.service.MemoBookService; import com.ruoyi.service.ZPropertyDownloadService; import com.ruoyi.service.ZPropertyService; import com.ruoyi.service.ZPropertyShareService; @@ -46,6 +48,9 @@ @Autowired private ZPropertyShareService zPropertyShareService; @Autowired private MemoBookService memoBookService; /** * 查询所有记录 @@ -145,6 +150,12 @@ @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { for (Long id: ids) { List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2026L); if (!memoBookService.removeByIds(memoBookService1)) return AjaxResult.error(); } if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids) ) ){ return AjaxResult.error(); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -8,7 +8,9 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.MemoBook; import com.ruoyi.domain.ZSecret; import com.ruoyi.service.MemoBookService; import com.ruoyi.service.ZSecretDownloadService; import com.ruoyi.service.ZSecretService; import com.ruoyi.service.ZSecretShareService; @@ -45,6 +47,9 @@ @Autowired private ZSecretDownloadService zSecretDownloadService; @Autowired private MemoBookService memoBookService; /** * 查询所有记录 @@ -144,6 +149,11 @@ @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { for (Long id: ids) { List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2031L); if (!memoBookService.removeByIds(memoBookService1)) return AjaxResult.error(); } if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids) ) ){ return AjaxResult.error(); } zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java
@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.domain.MemoBook; import java.util.List; /** * @Author Jinquan_Ou * @Description @@ -13,6 +15,7 @@ public interface MemoBookService extends IService<MemoBook> { AjaxResult mySave(MemoBook memoBook); AjaxResult selectDataList(Long fid, Long cid); List<MemoBook> selectByIdAFid(Long cid, Long fid); } zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -6,18 +6,13 @@ 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; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.constant.MenuAuthority; import com.ruoyi.domain.*; import com.ruoyi.mapper.ZfPropertyMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; @@ -29,8 +24,6 @@ import javax.annotation.Resource; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -70,6 +63,9 @@ @Resource private IZfPropertyShareService iZfPropertyShareService; @Resource private MemoBookService memoBookService; // private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) { @@ -569,6 +565,10 @@ if (!familyIdList.contains(data.getFamilyId())){ throw new RuntimeException("你没有权限操作此家庭的数据"); } List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId().longValue(),2007L); if (!memoBookService.removeByIds(memoBookService1)) return AjaxResult.error(); } List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids)); zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java
@@ -62,4 +62,12 @@ } @Override public List<MemoBook> selectByIdAFid(Long cid, Long fid) { LambdaQueryWrapper<MemoBook> lqw = new LambdaQueryWrapper<>(); lqw.eq(cid!=null,MemoBook::getCid,cid) .eq(fid!=null,MemoBook::getFid,fid); return list(lqw); } } zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java
@@ -308,6 +308,7 @@ za.setFid(zAuthority.getFid()); za.setUid(uid); addData(za); System.out.println(za); } // Long [] // if(bl) @@ -329,7 +330,7 @@ lqw.eq(ZAuthority::getFid,empowerDto.getFid()) .eq(ZAuthority::getAuthority, auri) .eq(ZAuthority::getUid, uid); System.out.println("11111111111111111111"+list(lqw)); zAuthorityService.remove(lqw); // addData(za); } zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -62,6 +62,9 @@ @Resource private ZfEquipDownloadService zfEquipDownloadService; @Resource private MemoBookService memoBookService; private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) { LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>(); lqw.orderByDesc(ZfEquipment::getCreateTime); @@ -592,6 +595,10 @@ if (!familyIdList.contains(data.getFamilyId())){ throw new RuntimeException("你没有权限操作此家庭的数据"); } List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId(),2017L); if (!memoBookService.removeByIds(memoBookService1)) return AjaxResult.error(); } List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids)); zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -53,6 +53,12 @@ @Resource ZfPetNoteService zfPetNoteService; @Resource ZfPetSharService zfPetSharService; @Resource ZfPetDownlService zfPetDownlService; @Override public AjaxResult selectDataList(ZfPet zfPet, Integer pageNum, Integer pageSize) { // LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet); @@ -272,6 +278,9 @@ if (!zfPetNoteService.removeBatchByIds(zfPetNoteService.getPetNoteByPetId(data.getId()))) return AjaxResult.error(); } if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids) ) ){ return AjaxResult.error(); } if (zfPetService.removeByIds(Arrays.asList(ids))) { return AjaxResult.success();
