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/ZfCleanServiceImpl.java | 522 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 333 insertions(+), 189 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 928222c..1ed99a3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.domain.ZfClean;
import com.ruoyi.mapper.ZfCleanMapper;
+import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCleanService;
@@ -30,7 +31,7 @@
import java.util.List;
import java.util.stream.Collectors;
-import static com.ruoyi.constant.MenuAuthority.CLEAN_LIST;
+import static com.ruoyi.constant.MenuAuthority.*;
/**
* <p>
@@ -50,8 +51,12 @@
@Resource
ZfCleanService zfCleanService;
- private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean) {
+ @Resource
+ ZAuthorityService zAuthorityService;
+
+ private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(ZfClean::getCreateTime);
lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())
.like(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
.like(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
@@ -60,6 +65,7 @@
.like(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
.like(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
.eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime())
+ .in(ZfClean::getFamilyId,familyIdList)
.between(zfClean.getHappenStartTime() != null && zfClean.getHappenEndTime() != null, ZfClean::getHappenTime, zfClean.getHappenStartTime(), zfClean.getHappenEndTime());
return lqw;
}
@@ -73,139 +79,154 @@
.eq(StringUtils.isNotEmpty(zfClean.getPlace()), ZfClean::getPlace, zfClean.getPlace())
.eq(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
.eq(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
+ .eq(zfClean.getFamilyId()!=null,ZfClean::getFamilyId,zfClean.getFamilyId())
.eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime());
return lqw;
}
- private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean, String familyIds, String secondFamilyAuthority) {
- //妯＄硦鏌ヨ鐨勬潯浠�
- LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean);
-
- //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿
- 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(ZfClean::getFamilyId, totalFamilyIdList);
- } else {
- //濡傛灉绗竴瀹跺涵鍙锋病鏈夐�楀彿浣嗘槸绗簩瀹跺涵鍙锋湁閫楀彿
- String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
- lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
- }
-
- } else {
- if (flag) {
- //濡傛灉绗竴瀹跺涵鍙锋湁閫楀彿浣嗙浜屽搴彿娌℃湁閫楀彿
- String[] familyList = familyIds.split(",");
- String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
- lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
- } else {
- //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘娌℃湁閫楀彿
- String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
- lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
- }
- }
- } else {
- //濡傛灉娌℃湁绗簩瀹跺涵鍙�
- if (flag) {
- String[] familyList = familyIds.split(",");
- lqw.in(ZfClean::getFamilyId, familyList);
- } else {
- lqw.eq(ZfClean::getFamilyId, familyIds);
- }
-
- }
-
- lqw.orderByDesc(ZfClean::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(CLEAN_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(CLEAN_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<ZfClean> buildCondition(ZfClean zfClean, String familyIds, String secondFamilyAuthority) {
+// //妯＄硦鏌ヨ鐨勬潯浠�
+// LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean);
+//
+// //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿
+// 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(ZfClean::getFamilyId, totalFamilyIdList);
+// } else {
+// //濡傛灉绗竴瀹跺涵鍙锋病鏈夐�楀彿浣嗘槸绗簩瀹跺涵鍙锋湁閫楀彿
+// String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
+// lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
+// }
+//
+// } else {
+// if (flag) {
+// //濡傛灉绗竴瀹跺涵鍙锋湁閫楀彿浣嗙浜屽搴彿娌℃湁閫楀彿
+// String[] familyList = familyIds.split(",");
+// String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
+// lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
+// } else {
+// //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘娌℃湁閫楀彿
+// String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
+// lqw.in(ZfClean::getFamilyId, totalFamilyIdList);
+// }
+// }
+// } else {
+// //濡傛灉娌℃湁绗簩瀹跺涵鍙�
+// if (flag) {
+// String[] familyList = familyIds.split(",");
+// lqw.in(ZfClean::getFamilyId, familyList);
+// } else {
+// lqw.eq(ZfClean::getFamilyId, familyIds);
+// }
+//
+// }
+//
+// lqw.orderByDesc(ZfClean::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(CLEAN_LIST)) {
+// secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+// break;
+// }
+// }
+// } else {
+// if (authorities.equals(CLEAN_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<ZfClean> selectByCondition(ZfClean zfClean) {
- String familyIds = listFamilyIds();
- String secondFamilyIds = listSecondFamilyIds();
- LambdaQueryWrapper<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, familyIds, secondFamilyIds);
+// String familyIds = listFamilyIds();
+// String secondFamilyIds = listSecondFamilyIds();
+// LambdaQueryWrapper<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, familyIds, secondFamilyIds);
+// List<ZfClean> beanRecords = list(lambdaQueryWrapper);
+// log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+// return markOwnData(familyIds, beanRecords);
+
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+ //涔熻鏌ュ埆浜烘巿鏉冪殑
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CLEAN_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+ //鍔犱笂鑷繁瀹跺涵鐨刬d
+ idList.add(familyId);
+
+ LambdaQueryWrapper<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList);
List<ZfClean> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyIds, beanRecords);
+ return markOwnData(familyId, beanRecords);
}
@Override
@@ -218,36 +239,71 @@
return list;
}
- private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> 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);
+// private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> 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());
+// }
+
+ public List<ZfClean> markOwnData(Long familyId,List<ZfClean> 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());
}
@Override
public AjaxResult selectDataList(ZfClean zfClean, Integer pageNum, Integer pageSize) {
- String familyIds = listFamilyIds();
- String secondFamilyAuthority = listSecondFamilyIds();
- LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean, familyIds, secondFamilyAuthority);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+// LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean, familyIds, secondFamilyAuthority);
+//
+// Page<ZfClean> zfCleanPage = new Page<>(pageNum, pageSize);
+// Page<ZfClean> pageResult = page(zfCleanPage, lqw);
+//
+// List<ZfClean> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+//
+// List<ZfClean> dtoResult = markOwnData(familyIds, beanRecords);
+//
+// HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
+// return AjaxResult.success(data);
+
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+ //涔熻鏌ュ埆浜烘巿鏉冪殑
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CLEAN_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+ //鍔犱笂鑷繁瀹跺涵鐨刬d
+ idList.add(familyId);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+ LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean, idList);
+
Page<ZfClean> zfCleanPage = new Page<>(pageNum, pageSize);
Page<ZfClean> pageResult = page(zfCleanPage, lqw);
List<ZfClean> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfClean> dtoResult = markOwnData(familyIds, beanRecords);
+ List<ZfClean> dtoResult = markOwnData(familyId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -256,56 +312,56 @@
@Override
public AjaxResult addData(ZfClean zfClean) {
- String familyIds = listFamilyIds();
- boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
- if (familyIds.contains(",")) {
- String[] familyList = familyIds.split(",");
- for (String familyId : familyList) {
- if (familyId.equals(zfClean.getFamilyId())) {
- flag = true;
- }
- }
- } else {
- if (zfClean.getFamilyId().equals(familyIds)) {
- flag = true;
- }
- }
- if (flag) {
- if (save(zfClean)) {
- return AjaxResult.success();
- } else {
- return AjaxResult.error();
- }
+// String familyIds = listFamilyIds();
+// boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
+// if (familyIds.contains(",")) {
+// String[] familyList = familyIds.split(",");
+// for (String familyId : familyList) {
+// if (familyId.equals(zfClean.getFamilyId())) {
+// flag = true;
+// }
+// }
+// } else {
+// if (zfClean.getFamilyId().equals(familyIds)) {
+// flag = true;
+// }
+// }
+// if (flag) {
+// if (save(zfClean)) {
+// return AjaxResult.success();
+// } else {
+// return AjaxResult.error();
+// }
+//
+// } else {
+// throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfClean.getFamilyId() + "鏁版嵁鐨勬潈闄�");
+// }
- } else {
- throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfClean.getFamilyId() + "鏁版嵁鐨勬潈闄�");
- }
- }
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
- @Override
- public AjaxResult addData2(ZfClean zfClean) {
- ZInfoUser mySelf = getMySelf();
- String myFamilyId = mySelf.getFamilyId();
-
- if (StringUtils.isNotEmpty(zfClean.getFamilyId())) {
- throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
- }
-
- if (StringUtils.isEmpty(myFamilyId)) {
+ if(familyId == null){
throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
}
- if (myFamilyId.contains(",")) {
- String[] myFamilyIds = myFamilyId.split(",");
- //榛樿娣诲姞绗竴涓搴殑鏁版嵁
- zfClean.setFamilyId(myFamilyIds[0]);
- } else {
- zfClean.setFamilyId(myFamilyId);
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CLEAN_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ if (zfClean.getFamilyId()!=null && !familyIdList.contains(zfClean.getFamilyId())) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+
+ if(zfClean.getFamilyId() == null){
+ //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+ zfClean.setFamilyId(familyId);
}
//鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
LambdaQueryWrapper<ZfClean> lqw = uniqueCondition(zfClean);
List<ZfClean> list = list(lqw);
+
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
}
@@ -315,7 +371,44 @@
} else {
return AjaxResult.error();
}
+
+
}
+
+// @Override
+// public AjaxResult addData2(ZfClean zfClean) {
+// ZInfoUser mySelf = getMySelf();
+// String myFamilyId = mySelf.getFamilyId();
+//
+// if (StringUtils.isNotEmpty(zfClean.getFamilyId())) {
+// throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
+// }
+//
+// if (StringUtils.isEmpty(myFamilyId)) {
+// throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+// }
+//
+// if (myFamilyId.contains(",")) {
+// String[] myFamilyIds = myFamilyId.split(",");
+// //榛樿娣诲姞绗竴涓搴殑鏁版嵁
+// zfClean.setFamilyId(myFamilyIds[0]);
+// } else {
+// zfClean.setFamilyId(myFamilyId);
+// }
+//
+// //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+// LambdaQueryWrapper<ZfClean> lqw = uniqueCondition(zfClean);
+// List<ZfClean> list = list(lqw);
+// if(list.size()>0){
+// throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+// }
+//
+// if (save(zfClean)) {
+// return AjaxResult.success();
+// } else {
+// return AjaxResult.error();
+// }
+// }
@@ -324,21 +417,72 @@
@Transactional
public AjaxResult importExcel(MultipartFile file) {
ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
- List<ZfClean> propertyList = null;
+ List<ZfClean> 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 (ZfClean zfClean : propertyList) {
- zfCleanService.addData2(zfClean);
+ for (ZfClean zfClean : dataList) {
+ zfCleanService.addData(zfClean);
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
}
+ @Override
+ public AjaxResult updateData(ZfClean zfClean) {
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+
+ //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔
+ Long dataFamilyId = getById(zfClean.getId()).getFamilyId();
+
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CLEAN_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+ if(updateById(zfClean)){
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+
+
+ }
+
+ @Override
+ public AjaxResult deleteData(Long[] ids) {
+ List<ZfClean> dataList = zfCleanService.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(CLEAN_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ for (ZfClean data : dataList) {
+ if (!familyIdList.contains(data.getFamilyId())){
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+ }
+
+ if (zfCleanService.removeByIds(Arrays.asList(ids))) {
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+
+
+ }
+
}
--
Gitblit v1.9.1