From 2039385fa4b4ac688907134ee7c7025fb2aea1fb Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期日, 16 七月 2023 12:59:17 +0800 Subject: [PATCH] 666 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 518 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 319 insertions(+), 199 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 0a139c9..b67f269 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 @@ -10,11 +10,11 @@ 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.*; import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZfEventMapper; +import com.ruoyi.service.ZAuthorityService; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfEventService; import com.ruoyi.util.ArraysUtil; @@ -30,8 +30,7 @@ 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; +import static com.ruoyi.constant.MenuAuthority.*; /** * <p> @@ -51,13 +50,18 @@ @Resource ZfEventService zfEventService; - private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) { + @Resource + ZAuthorityService zAuthorityService; + + private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) { LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>(); + lqw.orderByDesc(ZfEvent::getCreateTime); 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.in(ZfEvent::getFamilyId,familyIdList); lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime()); return lqw; } @@ -68,139 +72,149 @@ 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.getFamilyId()!=null,ZfEvent::getFamilyId,zfEvent.getFamilyId()); 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); - - //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿 - boolean flag = false; - - 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(); - } +// private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent, String familyIds, String secondFamilyAuthority) { +// //妯$硦鏌ヨ鐨勬潯浠� +// LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent); +// +// //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿 +// boolean flag = false; +// +// 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 Long listFamilyId() { +// ZInfoUser mySelf = getMySelf(); +// return mySelf.getFamilyId(); +// } +// +// private String listSecondFamilyIds() { +// ZInfoUser mySelf = getMySelf(); +// return mySelf.getSecondFamilyId(); +// } @Override public List<ZfEvent> selectByCondition(ZfEvent zfEvent) { - String familyIds = listFamilyIds(); - String secondFamilyIds = listSecondFamilyIds(); - LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, familyIds, secondFamilyIds); +// Long familyId = listFamilyId(); +// String secondFamilyIds = listSecondFamilyIds(); + //瑕佹煡鑷繁瀹跺涵鐨� + ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); + //涔熻鏌ュ埆浜烘巿鏉冪殑 + List<ZAuthority> authority = zAuthorityService.getAuthority(); + List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList()); + //鍔犱笂鑷繁瀹跺涵鐨刬d + idList.add(familyId); + + LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, idList); List<ZfEvent> beanRecords = list(lambdaQueryWrapper); log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords); - return markOwnData(familyIds, beanRecords); + return markOwnData(familyId, beanRecords); } @Override @@ -213,94 +227,118 @@ return list; } - 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); + public List<ZfEvent> markOwnData(Long familyId,List<ZfEvent> beanRecords){ + return beanRecords.stream().peek( + bean -> { + if (bean.getFamilyId() == familyId) { + bean.setOwnData(1); + } else { + bean.setOwnData(0); } } - } else { - if (familyIds.equals(recordFamilyId)) { - record.setOwnData(1); - } - } - }).collect(Collectors.toList()); + ).collect(Collectors.toList()); } + +// 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); + //瑕佹煡鑷繁瀹跺涵鐨� + ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); + //涔熻鏌ュ埆浜烘巿鏉冪殑 + List<ZAuthority> authority = zAuthorityService.getAuthority(); + List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList()); + //鍔犱笂鑷繁瀹跺涵鐨刬d + idList.add(familyId); +// String familyIds = listFamilyIds(); +// String secondFamilyAuthority = listSecondFamilyIds(); + LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList); + Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize); Page<ZfEvent> pageResult = page(zfEventPage, lqw); List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹� - List<ZfEvent> dtoResult = markOwnData(familyIds, beanRecords); + List<ZfEvent> dtoResult = markOwnData(familyId, 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 addData(ZfEvent zfEvent) { + ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); - 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)) { + if(familyId == null){ throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�"); } - if (myFamilyId.contains(",")) { - String[] myFamilyIds = myFamilyId.split(","); - //榛樿娣诲姞绗竴涓搴殑鏁版嵁 - zfEvent.setFamilyId(myFamilyIds[0]); - } else { - zfEvent.setFamilyId(myFamilyId); + List<ZAuthority> authority = zAuthorityService.getAuthority(); + List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList()); + familyIdList.add(familyId); + + if (zfEvent.getFamilyId()!=null && !familyIdList.contains(zfEvent.getFamilyId())) { + throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�"); + } + + + if(zfEvent.getFamilyId() == null){ + //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹� + zfEvent.setFamilyId(familyId); } //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹� - LambdaQueryWrapper<ZfEvent> zfEventLambdaQueryWrapper = uniqueCondition(zfEvent); - List<ZfEvent> list = list(zfEventLambdaQueryWrapper); + LambdaQueryWrapper<ZfEvent> lqw = uniqueCondition(zfEvent); + List<ZfEvent> list = list(lqw); + if(list.size()>0){ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁"); } @@ -312,28 +350,110 @@ } } +// @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; + List<ZfEvent> dataList = null; try { - propertyList = util.importExcel(file.getInputStream()); + dataList = util.importExcel(file.getInputStream()); } catch (Exception e) { throw new RuntimeException(e); } - log.info("璧勪骇鍒楄〃涓猴細{}", propertyList); + log.info("鏁版嵁鍒楄〃涓猴細{}", dataList); - for (ZfEvent zfEvent : propertyList) { - zfEventService.addData2(zfEvent); + for (ZfEvent zfEvent : dataList) { + zfEventService.addData(zfEvent); } return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); } - - - + + @Override + public AjaxResult updateData(ZfEvent zfEvent) { + ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); + + //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔 + Long dataFamilyId = getById(zfEvent.getId()).getFamilyId(); + + List<ZAuthority> authority = zAuthorityService.getAuthority(); + List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList()); + familyIdList.add(familyId); + + if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) { + throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�"); + } + + if(updateById(zfEvent)){ + return AjaxResult.success(); + }else { + return AjaxResult.error(); + } + + } + + @Override + public AjaxResult deleteData(Long[] ids) { + List<ZfEvent> dataList = zfEventService.listByIds(Arrays.asList(ids)); + + ZInfoUser myself = zInfoUserService.getMyself(); + Long familyId = myself.getFamilyId(); + + List<ZAuthority> authority = zAuthorityService.getAuthority(); + List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList()); + familyIdList.add(familyId); + + for (ZfEvent data : dataList) { + if (!familyIdList.contains(data.getFamilyId())){ + throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�"); + } + } + + if (zfEventService.removeByIds(Arrays.asList(ids))) { + return AjaxResult.success(); + }else { + return AjaxResult.error(); + } + + } + } -- Gitblit v1.9.1