From b019df4914f99aeb6b6c0ff111b1c8a4424d3331 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期三, 17 五月 2023 10:36:52 +0800 Subject: [PATCH] 调整了字段顺序与前端对应,添加了发生时间 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 303 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 284 insertions(+), 19 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java index 998c588..97d08ef 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java @@ -5,18 +5,31 @@ 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.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.ZInfoUser; +import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZfEventMapper; +import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfEventService; +import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; + +import static com.ruoyi.constant.MenuAuthority.EVENT_LIST; +import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST; /** * <p> @@ -30,33 +43,285 @@ @Service public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService { - @Override - public AjaxResult selectEventList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) { + @Resource + ZInfoUserService zInfoUserService; + + @Resource + ZfEventService zfEventService; + + private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) { + LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>(); + lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress()); + lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople()); + lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle()); + lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark()); + lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime()); + lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime()); + return lqw; + } + + private LambdaQueryWrapper<ZfEvent> uniqueCondition(ZfEvent zfEvent){ + LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>(); + lqw.eq(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress()); + lqw.eq(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople()); + lqw.eq(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle()); + lqw.eq(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark()); + lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime()); + return lqw; + } + + private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent, String familyIds, String secondFamilyAuthority) { + //妯$硦鏌ヨ鐨勬潯浠� LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent); - Page<ZfEvent> ZfEventPage = new Page<>(pageNum,pageSize); - Page<ZfEvent> pageResult = page(ZfEventPage, lqw); + //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿 + boolean flag = false; - HashMap<String, Object> data = MapUtils.getResult(pageResult); - return AjaxResult.success(data); + StringBuilder secondFamilyIdsBuffer = new StringBuilder(); + + //澶勭悊浼犲叆鐨剆econdFamilyAuthority 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) { + setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId); + } + + //鎶婂悗闈㈢殑閫楀彿鍘绘帀 + if (secondFamilyIdsBuffer.length() > 1) { + secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1); + } + + } else { + setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority); + //鎶婂悗闈㈢殑閫楀彿鍘绘帀 + if (secondFamilyIdsBuffer.length() > 1) { + secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1); + } + } + } + //灏哠tringBuffer杞垚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(ZfEvent::getFamilyId, totalFamilyIdList); + } else { + //濡傛灉绗竴瀹跺涵鍙锋病鏈夐�楀彿浣嗘槸绗簩瀹跺涵鍙锋湁閫楀彿 + String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds); + lqw.in(ZfEvent::getFamilyId, totalFamilyIdList); + } + + } else { + if (flag) { + //濡傛灉绗竴瀹跺涵鍙锋湁閫楀彿浣嗙浜屽搴彿娌℃湁閫楀彿 + String[] familyList = familyIds.split(","); + String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds); + lqw.in(ZfEvent::getFamilyId, totalFamilyIdList); + } else { + //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘娌℃湁閫楀彿 + String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds); + lqw.in(ZfEvent::getFamilyId, totalFamilyIdList); + } + } + } else { + //濡傛灉娌℃湁绗簩瀹跺涵鍙� + if (flag) { + String[] familyList = familyIds.split(","); + lqw.in(ZfEvent::getFamilyId, familyList); + } else { + lqw.eq(ZfEvent::getFamilyId, familyIds); + } + + } + + lqw.orderByDesc(ZfEvent::getCreateTime); + return lqw; + } + + private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) { + //寰楀埌鏉冮檺涓� + String authorities = authorityAndId.substring(2, authorityAndId.length() - 1); + + if (authorities.contains(" ")) { + //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺 + String[] authorityIdList = authorities.split(" "); + for (String s : authorityIdList) { + if (s.equals(EVENT_LIST)) { + secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(","); + break; + } + } + } else { + if (authorities.equals(EVENT_LIST)) { + secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(","); + } + } + } + + private ZInfoUser getMySelf() { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId); + return zInfoUserService.getOne(zInfoUserLambdaQueryWrapper); + } + + private String listFamilyIds() { + ZInfoUser mySelf = getMySelf(); + return mySelf.getFamilyId(); + } + + private String listSecondFamilyIds() { + ZInfoUser mySelf = getMySelf(); + return mySelf.getSecondFamilyId(); } @Override public List<ZfEvent> selectByCondition(ZfEvent zfEvent) { - LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent); - List<ZfEvent> list = list(lambdaQueryWrapper); - log.info("杩斿洖鐨勬暟鎹负:{}",list); - return list; + String familyIds = listFamilyIds(); + String secondFamilyIds = listSecondFamilyIds(); + LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, familyIds, secondFamilyIds); + List<ZfEvent> beanRecords = list(lambdaQueryWrapper); + log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords); + return markOwnData(familyIds, beanRecords); } - private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) { - LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>(); - lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()),ZfEvent::getAddress,zfEvent.getAddress()); - lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()),ZfEvent::getPeople,zfEvent.getPeople()); - lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()),ZfEvent::getTitle,zfEvent.getTitle()); - lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()),ZfEvent::getRemark,zfEvent.getRemark()); - lqw.like(zfEvent.getCreateTime()!=null,ZfEvent::getCreateTime,zfEvent.getCreateTime()); - return lqw; + private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> 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 selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) { + String familyIds = listFamilyIds(); + String secondFamilyAuthority = listSecondFamilyIds(); + LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds, secondFamilyAuthority); + + Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize); + Page<ZfEvent> pageResult = page(zfEventPage, lqw); + + List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹� + + List<ZfEvent> dtoResult = markOwnData(familyIds, beanRecords); + + HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult); + return AjaxResult.success(data); + } + + @Override + public AjaxResult addData(ZfEvent zfEvent) { + + String familyIds = listFamilyIds(); + boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞� + if (familyIds.contains(",")) { + String[] familyList = familyIds.split(","); + for (String familyId : familyList) { + if (familyId.equals(zfEvent.getFamilyId())) { + flag = true; + } + } + } else { + if (zfEvent.getFamilyId().equals(familyIds)) { + flag = true; + } + } + if (flag) { + if (save(zfEvent)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + + } else { + throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfEvent.getFamilyId() + "鏁版嵁鐨勬潈闄�"); + } + } + + @Override + public AjaxResult addData2(ZfEvent zfEvent) { + ZInfoUser mySelf = getMySelf(); + String myFamilyId = mySelf.getFamilyId(); + + if (StringUtils.isNotEmpty(zfEvent.getFamilyId())) { + throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�"); + } + + if (StringUtils.isEmpty(myFamilyId)) { + throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�"); + } + + if (myFamilyId.contains(",")) { + String[] myFamilyIds = myFamilyId.split(","); + //榛樿娣诲姞绗竴涓搴殑鏁版嵁 + zfEvent.setFamilyId(myFamilyIds[0]); + } else { + zfEvent.setFamilyId(myFamilyId); + } + + //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹� + LambdaQueryWrapper<ZfEvent> zfEventLambdaQueryWrapper = uniqueCondition(zfEvent); + List<ZfEvent> list = list(zfEventLambdaQueryWrapper); + if(list.size()>0){ + throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁"); + } + + if (save(zfEvent)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + } + + + @Override + @Transactional + public AjaxResult importExcel(MultipartFile file) { + ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class); + List<ZfEvent> propertyList = null; + try { + propertyList = util.importExcel(file.getInputStream()); + } catch (Exception e) { + throw new RuntimeException(e); + } + log.info("璧勪骇鍒楄〃涓猴細{}", propertyList); + + for (ZfEvent zfEvent : propertyList) { + zfEventService.addData2(zfEvent); + } + + return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); + + } + + + + } -- Gitblit v1.9.1