From fdfb696dd9c4ccfc54a7377729a51d489907dbbb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 17 Jun 2022 16:24:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=B8=AA=E5=88=AB=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E8=A7=84=E6=95=B4=20=E6=B2=A1=E6=B3=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandLawsSearchServiceImpl.java | 6 +++--- .../java/com/adc/da/mq/SendBussMQService.java | 4 +--- .../java/com/adc/da/mq/SendLawsMQService.java | 2 -- .../com/adc/da/mq/SendStandMQService.java | 2 -- doc/es/es 创建索引字段_bussioness.txt | 6 ------ doc/es/es 创建索引字段_fulltextserch.txt | 20 +++++++++++++++++-- doc/es/es 创建索引字段_laws.txt | 6 ------ doc/es/es 创建索引字段_stand.txt | 6 ------ 8 files changed, 22 insertions(+), 30 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 77620cf7..cbad2678 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -274,7 +274,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("standTypeOrder","1"); } fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); - fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); + fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && !"null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName"))); @@ -361,7 +361,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","4"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap)); - fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName"))); + fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("lawsYearName"))) && "null".equals(String.valueOf(attrInfoMap.get("lawsYearName")))) ? String.valueOf(attrInfoMap.get("lawsYearName")) : "0"); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName"))); @@ -428,7 +428,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","3"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); - fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); + fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && "null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name"))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index a58d5aa2..3df6114e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -138,7 +138,7 @@ public class SendBussMQService { saveMap.put("id",infoEO.getId()); saveMap.put("standSortOrder",esStateOrder(String.valueOf(infoEO.getStandSort()),dicMap)); - saveMap.put("yearOrder", infoEO.getStandYear()); + saveMap.put("standSort",infoEO.getStandSort()); saveMap.put("stand_sort",infoEO.getStandSort()); if(StringUtils.isNotEmpty(infoEO.getStandSort())){ @@ -150,10 +150,8 @@ public class SendBussMQService { saveMap.put("stand_year",infoEO.getStandYear()); if(jsonobject.get("standNumber") != null){ saveMap.put("standNumber",jsonobject.get("standNumber")); - saveMap.put("numberTitle", jsonobject.get("standNumber")); }else { saveMap.put("standNumber",""); - saveMap.put("numberTitle", ""); } saveMap.put("stand_code",infoEO.getStandCode()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index 9111e628..948feed8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -167,8 +167,6 @@ public class SendLawsMQService { lawsTypeName = dicTypeEODao.getDicNamesByCodes(valArr,""); } saveMap.put("standSortOrder",esStateOrder(infoEO.getLawsType(),dicMap)); - saveMap.put("yearOrder", infoEO.getLawsYear()); - saveMap.put("numberTitle", infoEO.getLawsNumber()); saveMap.put("lawsType",infoEO.getLawsType()); saveMap.put("lawsTypeName",lawsTypeName); saveMap.put("lawsNumber",infoEO.getLawsNumber()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 898c5260..bc7c78a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -117,8 +117,6 @@ public class SendStandMQService { saveMap.put("countryShow",codeName); } saveMap.put("standSortOrder",esStateOrder(String.valueOf(infoEO.getStandSort()),dicMap)); - saveMap.put("yearOrder", infoEO.getStandYear()); - saveMap.put("numberTitle", infoEO.getStandNumber()); saveMap.put("standSort",infoEO.getStandSort()); saveMap.put("stand_sort",infoEO.getStandSort()); if (StringUtils.isNotEmpty(infoEO.getStandSort())) { diff --git a/doc/es/es 创建索引字段_bussioness.txt b/doc/es/es 创建索引字段_bussioness.txt index 0b7eb2be..58d63d8a 100644 --- a/doc/es/es 创建索引字段_bussioness.txt +++ b/doc/es/es 创建索引字段_bussioness.txt @@ -5,12 +5,6 @@ bussstand/bussstand/_mapping?pretty&include_type_name=true "properties": { "standSortOrder": { "type": "integer" - }, - "numberTitle": { - "type": "integer" - }, - "yearOrder": { - "type": "integer" }, "BARQ": { "type": "text", diff --git a/doc/es/es 创建索引字段_fulltextserch.txt b/doc/es/es 创建索引字段_fulltextserch.txt index 6af67fa0..ec5c628b 100644 --- a/doc/es/es 创建索引字段_fulltextserch.txt +++ b/doc/es/es 创建索引字段_fulltextserch.txt @@ -52,7 +52,16 @@ fulltextserch/fulltextserch/_mapping?pretty&include_type_name=true "fielddata": true }, "numberTitle": { - "type": "integer" + "type": "text", + "analyzer": "ik_max_word", + "search_analyzer": "ik_max_word", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + }, + "fielddata": true }, "nameTitle": { "type": "text", @@ -67,7 +76,14 @@ fulltextserch/fulltextserch/_mapping?pretty&include_type_name=true "fielddata": true }, "yearOrder": { - "type": "integer" + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + }, + "fielddata": true }, "standSortOrder": { "type": "integer" diff --git a/doc/es/es 创建索引字段_laws.txt b/doc/es/es 创建索引字段_laws.txt index d79b1110..ae65838f 100644 --- a/doc/es/es 创建索引字段_laws.txt +++ b/doc/es/es 创建索引字段_laws.txt @@ -6,12 +6,6 @@ laws/laws/_mapping?pretty&include_type_name=true "standSortOrder": { "type": "integer" }, - "numberTitle": { - "type": "integer" - }, - "yearOrder": { - "type": "integer" - }, "BDTWJHLAWS": { "type": "text", "fields": { diff --git a/doc/es/es 创建索引字段_stand.txt b/doc/es/es 创建索引字段_stand.txt index 95ff3a34..b0b3fe6a 100644 --- a/doc/es/es 创建索引字段_stand.txt +++ b/doc/es/es 创建索引字段_stand.txt @@ -6,12 +6,6 @@ stand/stand/_mapping?pretty&include_type_name=true "standSortOrder": { "type": "integer" }, - "numberTitle": { - "type": "integer" - }, - "yearOrder": { - "type": "integer" - }, "BARQ": { "type": "text", "fields": {