From adeec8aafe23ed8255941db26e2245d7da8f6405 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期三, 08 一月 2025 15:30:41 +0800 Subject: [PATCH] 修改了家庭设备排序时间 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 72 insertions(+), 12 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java index 1c589ab..5fd0d2e 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java @@ -5,23 +5,23 @@ 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; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.domain.ZSelfNote; +import com.ruoyi.domain.*; import com.ruoyi.mapper.ZSelfNoteMapper; -import com.ruoyi.service.ZSelfNoteService; +import com.ruoyi.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; /** * <p> @@ -35,7 +35,19 @@ public class ZSelfNoteServiceImpl extends ServiceImpl<ZSelfNoteMapper, ZSelfNote> implements ZSelfNoteService { @Autowired - ZSelfNoteServiceImpl zSelfNoteService; + ZSelfNoteService zSelfNoteService; + + @Resource + ZfShareDataService zfShareDataService; + + @Resource + private EsService esSer; + + @Resource + private ZInfoUserService zInfoUserService; + + @Resource + private ZfClanService zfClanService; private LambdaQueryWrapper<ZSelfNote> uniqueCondition(ZSelfNote zSelfNote) { LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>(); @@ -48,9 +60,9 @@ return lqw; } - private LambdaQueryWrapper<ZSelfNote> buildCondition(ZSelfNote zSelfNote, Long userId) { + private LambdaQueryWrapper<ZSelfNote> buildCondition(ZSelfNote zSelfNote) { LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>(); - lqw.eq(userId != null, ZSelfNote::getUid, userId) + lqw.in(ZSelfNote::getUid, getAll()) .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople()) .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle()) .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress()) @@ -60,19 +72,62 @@ return lqw; } + public List<Long> getAll(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + + List<ZfShareData> shareId = zfShareDataService.getShareId(userId); + List<ZfShareData> zfShareDataList = zfShareDataService.selectList(); + List<Long> all = new ArrayList<>(); + all.add(userId); + if(shareId.size() >0 ) { + if (shareId.get(0).getMasterAccount() == 0 || shareId.get(0).getMasterAccount() == userId.intValue()) { + all.add(shareId.get(0).getUserId().longValue()); + } + else { + all.clear(); + all.add(0L); + return all; + } + } + if (zfShareDataList.size()>0 && (zfShareDataList.get(0).getMasterAccount() == 0 || zfShareDataList.get(0).getMasterAccount() == userId.intValue())){ + for (ZfShareData zfShareOther: zfShareDataList) { + all.add(zfShareOther.getSharedId().longValue()); + } + } + + return all; + } + /** * 鍒嗛〉鏌ユ壘 */ @Override public AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize) { + LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote); SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); - LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote, userId); + List<ZfShareData> zfShareOtherList = zfShareDataService.selectList(); + List<ZfShareData> shareId = zfShareDataService.getShareId(userId); + if (list(lqw).size()==0) { + Integer masterAccount = 0; + if(zfShareOtherList.size()>0 ){ + masterAccount = zfShareOtherList.get(0).getMasterAccount();} + if(shareId.size()>0){ + masterAccount = shareId.get(0).getMasterAccount(); + } + ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(masterAccount.longValue()); + if (infoBysysId !=null) + { ZfClan byId = zfClanService.getById(infoBysysId.getClanId()); + return AjaxResult.success("璇峰墠寰�瀹舵棌鍚嶇О涓�"+byId.getClanName()+",鐢ㄦ埛鍚嶄负"+infoBysysId.getNickName()+"鐨勭敤鎴疯处鍙蜂笅鏌ョ湅"); + } + } Page<ZSelfNote> pageBean = new Page<>(pageNum, pageSize); Page<ZSelfNote> pageResult = page(pageBean, lqw); List<ZSelfNote> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹� + HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords); return AjaxResult.success(data); @@ -118,7 +173,7 @@ Long userId = user.getUserId(); ZSelfNote zSelfNote = new ZSelfNote(); - LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote, userId); + LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote); return list(lqw); } @@ -137,7 +192,12 @@ assert dataList != null; for (ZSelfNote zSelfNote : dataList) { - zSelfNoteService.mySave(zSelfNote); + + if (zSelfNote.getTitle().length() != 0 && zSelfNote.getPeople().length() !=0){ + mySave(zSelfNote);} + else { + throw new RuntimeException("鏈夋暟鎹殑鏍囬鎴栦汉鐗╀负绌�"); + } } return AjaxResult.success(); -- Gitblit v1.9.1