From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 312 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 272 insertions(+), 40 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index e90659e..1840a69 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -5,24 +5,26 @@
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.EsModel;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfDoctorMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfDoctorService;
+import com.ruoyi.service.*;
import com.ruoyi.service.ZfDoctorService;
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.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.*;
@@ -48,6 +50,22 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfDoctorMapper zfDoctorMapper;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ ZfDoctorShareService zfDoctorShareService;
+
+ @Resource
+ ZfDoctorDownloadService zfDoctorDownloadService;
+
+
@Override
public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
// LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor);
@@ -60,24 +78,44 @@
// return AjaxResult.success(data);
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if (myself == null) {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ 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(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
-// String familyIds = listFamilyIds();
-// String secondFamilyAuthority = listSecondFamilyIds();
- LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor, idList);
+ //鍔犱笂鐖舵瘝瀹舵棌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<ZfDoctor> lqw = buildCondition(zfDoctor, idList);
Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
Page<ZfDoctor> pageResult = page(zfDoctorPage, lqw);
List<ZfDoctor> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfDoctor> dtoResult = markOwnData(familyId, beanRecords);
-
+ List<ZfDoctor> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
}
@@ -93,28 +131,42 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+
+
LambdaQueryWrapper<ZfDoctor> lambdaQueryWrapper = buildCondition(zfDoctor, idList);
List<ZfDoctor> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
}
- public List<ZfDoctor> markOwnData(Long familyId,List<ZfDoctor> beanRecords){
+ public List<ZfDoctor> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfDoctor> beanRecords) {
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
}
}
- ).collect(Collectors.toList());
+ ).sorted((a, b) -> b.getOwnData() - a.getOwnData()).collect(Collectors.toList());
}
@Override
@@ -138,10 +190,17 @@
}
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
- for (ZfDoctor zfDoctor : dataList) {
- zfDoctorService.addData(zfDoctor);
- }
+ for (ZfDoctor zfDoctor : dataList) {
+// if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
+ if(zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null){
+ throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
+ }
+ else {
+ zfDoctorService.addData(zfDoctor);
+ }
+ }
+// }
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
}
@@ -151,7 +210,7 @@
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
- if(familyId == null){
+ if (familyId == null) {
throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
}
@@ -159,12 +218,16 @@
List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
familyIdList.add(familyId);
- if (zfDoctor.getFamilyId()!=null && !familyIdList.contains(zfDoctor.getFamilyId())) {
+// List<ZfDoctorShare> authority1 = zfDoctorShareService.getAuthority();
+// List<Long> idList1 = authority1.stream().filter(auth -> auth.getShareContent().toString().equals(DOCTOR_LIST)).map(ZfDoctorShare::getShareId).collect(Collectors.toList());
+// zfDoctorService.addData(zfDoctor);
+
+ if (zfDoctor.getFamilyId() != null && !familyIdList.contains(zfDoctor.getFamilyId())) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
- if(zfDoctor.getFamilyId() == null){
+ if (zfDoctor.getFamilyId() == null) {
//榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
zfDoctor.setFamilyId(familyId);
}
@@ -173,16 +236,40 @@
LambdaQueryWrapper<ZfDoctor> lqw = uniqueCondition(zfDoctor);
List<ZfDoctor> list = list(lqw);
- if(list.size()>0){
+ if (list.size() > 0) {
throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
}
if (save(zfDoctor)) {
+ EsModel esModel = new EsModel();
+ Integer inte = zfDoctor.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("瀹跺涵灏忓尰鐢�");
+ esModel.setBy1(zfDoctor.getType());
+ esModel.setBy2(zfDoctor.getSymptom());
+ esModel.setBy3(zfDoctor.getEffect());
+ esModel.setBy4(zfDoctor.getSuitable());
+ esModel.setBy5("/family/zfDoctor");
+ esModel.setBy6(zfDoctor.getCmedical());
+ esModel.setBy7(zfDoctor.getWmedical());
+// esModel.setBy7();
+ esModel.setRemark(zfDoctor.getRemark());
+ esModel.setFid(familyId);
+
+
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
return AjaxResult.success();
} else {
return AjaxResult.error();
}
}
+
+
+ @Resource
+ ZfLogService zfLogService;
@Override
public AjaxResult updateData(ZfDoctor zfDoctor) {
@@ -196,13 +283,92 @@
List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList());
familyIdList.add(familyId);
- if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
+ if (dataFamilyId != null && !familyIdList.contains(dataFamilyId)) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
- if(updateById(zfDoctor)){
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹跺涵灏忓尰鐢�");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
+ if (updateById(zfDoctor)) {
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfDoctor dataById = getById(zfDoctor.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵灏忓尰鐢�");
+
+ if (esResult == null) {
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if (zfDoctor.getType() != null) {
+ newModel.setBy1(zfDoctor.getType());
+ } else {
+ newModel.setBy1(dataById.getType());
+ }
+
+ if (zfDoctor.getSymptom() != null) {
+ newModel.setBy2(zfDoctor.getSymptom());
+ } else {
+ newModel.setBy2(dataById.getSymptom());
+ }
+
+ if (zfDoctor.getEffect() != null) {
+ newModel.setBy3(zfDoctor.getEffect());
+ } else {
+ newModel.setBy3(dataById.getEffect());
+ }
+
+ if (zfDoctor.getSuitable() != null) {
+ newModel.setBy4(zfDoctor.getSuitable());
+ } else {
+ newModel.setBy4(dataById.getSuitable());
+ }
+
+ if (zfDoctor.getCmedical() != null) {
+ newModel.setBy6(zfDoctor.getCmedical());
+ } else {
+ newModel.setBy6(dataById.getCmedical());
+ }
+
+ if (zfDoctor.getWmedical() != null) {
+ newModel.setBy7(zfDoctor.getWmedical());
+ } else {
+ newModel.setBy7(dataById.getWmedical());
+ }
+
+ if (zfDoctor.getRemark() != null) {
+ newModel.setRemark(zfDoctor.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(),
+ "by6", newModel.getBy6(),
+ "by7", newModel.getBy7(),
+ "remark", newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
return AjaxResult.success();
- }else {
+ } else {
return AjaxResult.error();
}
}
@@ -219,16 +385,40 @@
familyIdList.add(familyId);
for (ZfDoctor data : dataList) {
- if (!familyIdList.contains(data.getFamilyId())){
+ if (!familyIdList.contains(data.getFamilyId())) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
}
-
- if (zfDoctorService.removeByIds(Arrays.asList(ids))) {
- return AjaxResult.success();
- }else {
+ List<ZfDoctor> zfDoctors = listByIds(Arrays.asList(ids));
+ if (! (zfDoctorDownloadService.deleteData(ids) && zfDoctorShareService.deleteByContentId(ids) ) ){
return AjaxResult.error();
}
+ if (zfDoctorService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfDoctors.stream().forEach(zfDoctor -> {
+ EsModel esModel = esService.findByCtId(zfDoctor.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();
+ }
+ }
+
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfDoctorMapper.listType();
+ return AjaxResult.success(result);
}
// @Override
@@ -259,29 +449,71 @@
lqw.eq(StringUtils.isNotEmpty(zfDoctor.getEffect()), ZfDoctor::getEffect, zfDoctor.getEffect());
lqw.eq(StringUtils.isNotEmpty(zfDoctor.getSuitable()), ZfDoctor::getSuitable, zfDoctor.getSuitable());
lqw.eq(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
- lqw.eq(zfDoctor.getFamilyId()!=null,ZfDoctor::getFamilyId,zfDoctor.getFamilyId());
+ lqw.eq(zfDoctor.getFamilyId() != null, ZfDoctor::getFamilyId, zfDoctor.getFamilyId());
return lqw;
}
- private LambdaQueryWrapper<ZfDoctor> buildCondition(ZfDoctor zfDoctor,List<Long> familyIdList) {
+ private LambdaQueryWrapper<ZfDoctor> buildCondition(ZfDoctor zfDoctor, List<Long> familyIdList) {
LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();
- lqw.in(ZfDoctor::getFamilyId,familyIdList);
+ lqw.in(ZfDoctor::getFamilyId, familyIdList);
lqw.orderByDesc(ZfDoctor::getCreateTime);
lqw.like(StringUtils.isNotEmpty(zfDoctor.getType()), ZfDoctor::getType, zfDoctor.getType())
.like(StringUtils.isNotEmpty(zfDoctor.getSymptom()), ZfDoctor::getSymptom, zfDoctor.getSymptom())
.like(StringUtils.isNotEmpty(zfDoctor.getDuration()), ZfDoctor::getDuration, zfDoctor.getDuration())
.like(StringUtils.isNotEmpty(zfDoctor.getEffect()), ZfDoctor::getEffect, zfDoctor.getEffect())
.like(StringUtils.isNotEmpty(zfDoctor.getSuitable()), ZfDoctor::getSuitable, zfDoctor.getSuitable())
- .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()),ZfDoctor::getWmedical,zfDoctor.getWmedical())
- .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()),ZfDoctor::getCmedical,zfDoctor.getCmedical())
+ .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()), ZfDoctor::getWmedical, zfDoctor.getWmedical())
+ .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()), ZfDoctor::getCmedical, zfDoctor.getCmedical())
.like(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
- if (StringUtils.isNotEmpty(zfDoctor.getPrescription())){
+ if (StringUtils.isNotEmpty(zfDoctor.getPrescription())) {
lqw.and(wrapper -> {
- wrapper.like(StringUtils.isNotEmpty(zfDoctor.getPrescription()),ZfDoctor::getWmedical,zfDoctor.getPrescription())
+ wrapper.like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getWmedical, zfDoctor.getPrescription())
.or()
- .like(StringUtils.isNotEmpty(zfDoctor.getPrescription()),ZfDoctor::getCmedical,zfDoctor.getPrescription());
+ .like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getCmedical, zfDoctor.getPrescription());
});
}
return lqw;
}
-}
+
+// public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
+// LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();
+// lqw.eq(ZfDoctor::getId, ids);
+//
+// return lqw;
+// }
+// @Override
+// public AjaxResult selectListById(List<Long> ids, Integer pageNum, Integer pageSize) {
+// List<ZfDoctor> lqw2 = new ArrayList<>();
+//
+// LambdaQueryWrapper<ZfDoctor> lqw = buildCondition2(ids);
+// List<ZfDoctor> bb = list(lqw);
+// System.out.println("15052222254"+bb);
+//
+// Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
+// Page<ZfDoctor> pageResult = page(zfDoctorPage, lqw);
+// List<ZfDoctor> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+// System.out.println(beanRecords);
+//
+// HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+//
+//
+// return AjaxResult.success(data);
+//// }
+
+// private List<Long> buildCondition1(){
+// List<ZfDoctorShare> authority1 = zfDoctorShareService.getAuthority();
+// List<Long> idList1 = authority1.stream().filter(auth -> auth.getShareContent().toString().equals(DOCTOR_LIST)).map(ZfDoctorShare::getShareId).collect(Collectors.toList());
+// return idList1;
+// }
+// private LambdaQueryWrapper<ZfDoctor> buildCondition2(ZfDoctor zfDoctor, List<Long> IdList) {
+// LambdaQueryWrapper<ZfDoctorShare> lqw = new LambdaQueryWrapper<>();
+// lqw.in(ZfDoctorShare::getShareId, IdList);
+// List<ZfDoctorShare> beanRecords = list(lqw);
+// for (ZfDoctorShare shareContent : beanRecords){
+// zfDoctorService.getById(shareContent);
+// }
+//
+// }
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.1