From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 701 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 503 insertions(+), 198 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..e5c421d 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
@@ -5,32 +5,32 @@
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.core.domain.entity.EsModel;
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.*;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.mapper.ZfCleanMapper;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfCleanService;
+import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.*;
import java.util.stream.Collectors;
-import static com.ruoyi.constant.MenuAuthority.CLEAN_LIST;
+import static com.ruoyi.constant.MenuAuthority.*;
/**
* <p>
@@ -50,9 +50,29 @@
@Resource
ZfCleanService zfCleanService;
- private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean) {
+ @Resource
+ ZAuthorityService zAuthorityService;
+
+ @Resource
+ ZfLogService zfLogService;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ ZfCleanShareService zfCleanShareService;
+
+ @Resource
+ ZfCleanDownloadService zfCleanDownloadService;
+
+ 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())
+ .eq(zfClean.getId()!=null,ZfClean::getId,zfClean.getId())
.like(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
.like(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
.like(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())
@@ -60,6 +80,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 +94,172 @@
.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();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ System.out.println("11111111111111111111");
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).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);
+
+ //鍔犱笂鐖舵瘝鐨刬d
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
+ LambdaQueryWrapper<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList);
List<ZfClean> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyIds, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -218,36 +272,94 @@
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,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> beanRecords){
+ return beanRecords.stream().peek(
+ bean -> {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
+ bean.setOwnData(1);
+ } else {
+ bean.setOwnData(0);
}
}
- } else {
- if (familyIds.equals(recordFamilyId)) {
- record.setOwnData(1);
- }
- }
- }).collect(Collectors.toList());
+ ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).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();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
+ Long familyId = myself.getFamilyId();
+ System.out.println("22222222222222222222");
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).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);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
+// 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,fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -256,66 +368,123 @@
@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();
- }
- } else {
- throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfClean.getFamilyId() + "鏁版嵁鐨勬潈闄�");
- }
- }
+ if(zfClean.getKind()==null)
+ zfClean.setKind(0);
+// 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() + "鏁版嵁鐨勬潈闄�");
+// }
- @Override
- public AjaxResult addData2(ZfClean zfClean) {
- ZInfoUser mySelf = getMySelf();
- String myFamilyId = mySelf.getFamilyId();
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = 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("璇峰嬁鏂板閲嶅鏁版嵁");
}
if (save(zfClean)) {
+ EsModel esModel = new EsModel();
+ Integer inte = zfClean.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("淇濇磥涓庢敹绾�");
+ esModel.setBy1(zfClean.getType());
+ esModel.setBy2(zfClean.getMethod());
+ esModel.setBy3(zfClean.getPlace());
+ esModel.setBy4(zfClean.getSuitable());
+ esModel.setBy5("/family/zfClean");
+ esModel.setRemark(zfClean.getRemark());
+ esModel.setFid(familyId);
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
+
+
return AjaxResult.success();
} 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 +493,157 @@
@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);
-
- for (ZfClean zfClean : propertyList) {
- zfCleanService.addData2(zfClean);
+ log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
+ for (ZfClean zfClean : dataList) {
+ if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
+ 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("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("淇濇磥鏀剁撼");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
+
+ if(updateById(zfClean)){
+
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfClean dataById = getById(zfClean.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "淇濇磥涓庢敹绾�");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfClean.getType()!=null){
+ newModel.setBy1(zfClean.getType());
+ }else {
+ newModel.setBy1(dataById.getType());
+ }
+
+ if(zfClean.getMethod()!=null){
+ newModel.setBy2(zfClean.getMethod());
+ }else {
+ newModel.setBy2(dataById.getMethod());
+ }
+
+ if(zfClean.getPlace()!=null){
+ newModel.setBy3(zfClean.getPlace());
+ }else {
+ newModel.setBy3(dataById.getPlace());
+ }
+
+ if(zfClean.getSuitable()!=null){
+ newModel.setBy4(zfClean.getSuitable());
+ }else {
+ newModel.setBy4(dataById.getSuitable());
+ }
+
+ if(zfClean.getRemark()!=null){
+ newModel.setRemark(zfClean.getRemark());
+ }else {
+ newModel.setRemark(dataById.getRemark());
+ }
+
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2(),
+ "by3",newModel.getBy3(),
+ "by4",newModel.getBy4(),
+ "remark",newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ 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("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+ }
+
+ List<ZfClean> zfCleans = listByIds(Arrays.asList(ids));
+ if (! (zfCleanDownloadService.deleteData(ids) && zfCleanShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
+ if (zfCleanService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfCleans.stream().forEach(zfClean -> {
+ EsModel esModel = esService.findByCtId(zfClean.getId().intValue(), "淇濇磥涓庢敹绾�");
+
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+
+
+ }
+
}
--
Gitblit v1.9.1