From d221c28fa06bd7f400b9e6510e8d3be30fe97f9f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 18 九月 2023 12:21:00 +0800
Subject: [PATCH] 34678913687
---
zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java | 27 +++++++++++++++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 1 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 6 ++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 1 +
9 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
index d13f7e5..f2c93da 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
@@ -27,6 +27,10 @@
@Field(index = true,type = FieldType.Long)
private Long ctId;
+ /**** es涓搴旂殑鏁版嵁鎵�灞炲搴璱d*/
+ @Field(index = true,type = FieldType.Long)
+ private Long fid;
+
/**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨勪笟鍔℃暟鎹簱琛ㄥ悕绉�*/
@Field(type = FieldType.Text,analyzer = "ik_max_word")
private String ctTableName;
@@ -75,4 +79,6 @@
private String by7;
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
index a2ffacc..e85f759 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
@@ -1,9 +1,13 @@
package com.ruoyi.service.impl;
import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.domain.ZAuthority;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.mapper.EsRepository;
import com.ruoyi.service.EsService;
+import com.ruoyi.service.ZAuthorityService;
+import com.ruoyi.service.ZInfoUserService;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
@@ -22,6 +26,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.constant.MenuAuthority.EQUIPMENT_LIST;
@Service
public class EsServiceImpl implements EsService {
@@ -29,6 +36,13 @@
private EsRepository esRepository;
@Resource
private ElasticsearchRestTemplate elasticsearchRestTemplate;
+
+ @Resource
+ private ZInfoUserService zInfoUserService;
+
+ @Resource
+ private ZAuthorityService zAuthorityService;
+
@Override
public int insertTable(EsModel esModel) {
try {
@@ -49,6 +63,18 @@
//澶氬瓧娈佃繘琛屽尮閰�
// MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(con, "ctName", "ctContent","remark",
// "by1","by2","by3","by4");
+
+
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+ //涔熻鏌ュ埆浜烘巿鏉冪殑
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+ //鍔犱笂鑷繁瀹跺涵鐨刬d
+ idList.add(familyId);
+
+
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
boolQueryBuilder.should(QueryBuilders.matchQuery("ctName",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("ctContent",con));
@@ -59,6 +85,7 @@
boolQueryBuilder.should(QueryBuilders.matchQuery("by4",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("by6",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("by7",con));
+ boolQueryBuilder.filter(QueryBuilders.termsQuery("fid", idList));
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder()
.withQuery(boolQueryBuilder);
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 a09327c..0157bf1 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
@@ -391,6 +391,7 @@
esModel.setBy4(zfClean.getSuitable());
esModel.setBy5("/family/zfClean");
esModel.setRemark(zfClean.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 95c6744..56f0846 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -406,6 +406,7 @@
esModel.setBy5("/family/zfCollection");
esModel.setBy6(zfCollection.getLocation());
esModel.setRemark(zfCollection.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index ddfe5d6..a1a34fc 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -375,6 +375,7 @@
esModel.setBy4(zfContact.getWork());
esModel.setBy5("/family/zfContact");
esModel.setRemark(zfContact.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
return AjaxResult.success();
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 a89c0df..dca3b77 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
@@ -204,6 +204,7 @@
esModel.setBy6(zfDoctor.getCmedical());
esModel.setBy7(zfDoctor.getWmedical());
esModel.setRemark(zfDoctor.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
return AjaxResult.success();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 4e2b11d..69f651e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -417,6 +417,7 @@
esModel.setBy2(zfEconomy.getUsePeople());
esModel.setBy5("/family/zfEconomy");
esModel.setRemark(zfEconomy.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
return AjaxResult.success();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index fbdc87b..e925a07 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -356,6 +356,7 @@
esModel.setBy4(zfEquipment.getLocation());
esModel.setBy5("/family/zfEquipment");
esModel.setRemark(zfEquipment.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
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 d6f18db..f575ebc 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
@@ -366,6 +366,7 @@
esModel.setRemark(zfEvent.getRemark());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/family/zfEvent");
+ esModel.setFid(familyId);
esSer.insertTable(esModel);
return AjaxResult.success();
--
Gitblit v1.9.1