From 3cfa0bda6574d0c39db120c457e98a168aa193e8 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 23 四月 2023 17:15:20 +0800
Subject: [PATCH] 完成婚姻
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 264 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 216 insertions(+), 48 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 9fef9fc..6d4d8e6 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
@@ -13,17 +13,23 @@
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfProperty;
+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.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>
@@ -43,40 +49,186 @@
@Resource
ZfEventService zfEventService;
- private String listFamilyIds() {
+ 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> 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);
- ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
- return zInfoUser.getFamilyId();
+ return zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
}
-
- @Override
- public AjaxResult selectEventList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
- String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);
-
- Page<ZfEvent> ZfEventPage = new Page<>(pageNum, pageSize);
- Page<ZfEvent> pageResult = page(ZfEventPage, lqw);
-
- HashMap<String, Object> data = MapUtils.getResult(pageResult);
- return AjaxResult.success(data);
+ 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) {
String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);
- List<ZfEvent> list = list(lqw);
- log.info("杩斿洖鐨勬暟鎹负:{}", list);
- return list;
+ String secondFamilyIds = listSecondFamilyIds();
+ LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, familyIds, secondFamilyIds);
+ List<ZfEvent> beanRecords = list(lambdaQueryWrapper);
+ log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+ return markOwnData(familyIds, beanRecords);
+ }
+
+ 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 int addEvent(ZfEvent zfEvent) {
+ 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(",")) {
@@ -92,51 +244,67 @@
}
}
if (flag) {
- boolean save = save(zfEvent);
- return save ? 1 : 0;
+ 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);
+ }
+
+ 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> eventList = null;
+ List<ZfEvent> propertyList = null;
try {
- eventList = util.importExcel(file.getInputStream());
+ propertyList = util.importExcel(file.getInputStream());
} catch (Exception e) {
throw new RuntimeException(e);
}
- log.info("璧勪骇鍒楄〃涓猴細{}", eventList);
+ log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
- for (ZfEvent zfEvent : eventList) {
- zfEventService.addEvent(zfEvent);
+ for (ZfEvent zfEvent : propertyList) {
+ zfEventService.addData2(zfEvent);
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
- 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> buildCondition(ZfEvent zfEvent, String familyIds) {
- LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent);
- if (familyIds.contains(",")) {
- String[] familyList = familyIds.split(",");
- lqw.in(ZfEvent::getFamilyId, familyList);
- } else {
- lqw.eq(ZfEvent::getFamilyId, familyIds);
- }
- return lqw;
- }
+
+
+
}
--
Gitblit v1.9.1