From 113587333f8cc5181dd368d9b95f9f7911b3439e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 17 Jun 2022 15:49:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2ES=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=20=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=88=86=E8=AF=8D=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 3 +++ .../src/main/java/com/adc/da/mq/SendLawsMQService.java | 2 ++ .../src/main/java/com/adc/da/mq/SendStandMQService.java | 2 ++ doc/es/es 创建索引字段_bussioness.txt | 6 ++++++ doc/es/es 创建索引字段_fulltextserch.txt | 9 +-------- doc/es/es 创建索引字段_laws.txt | 6 ++++++ doc/es/es 创建索引字段_stand.txt | 6 ++++++ 7 files changed, 26 insertions(+), 8 deletions(-) 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 7caff666..a58d5aa2 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,6 +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())){ @@ -149,8 +150,10 @@ 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 948feed8..9111e628 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,6 +167,8 @@ 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 bc7c78a3..898c5260 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,6 +117,8 @@ 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 58d63d8a..0b7eb2be 100644 --- a/doc/es/es 创建索引字段_bussioness.txt +++ b/doc/es/es 创建索引字段_bussioness.txt @@ -5,6 +5,12 @@ 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 29a5cd2e..6af67fa0 100644 --- a/doc/es/es 创建索引字段_fulltextserch.txt +++ b/doc/es/es 创建索引字段_fulltextserch.txt @@ -67,14 +67,7 @@ fulltextserch/fulltextserch/_mapping?pretty&include_type_name=true "fielddata": true }, "yearOrder": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - }, - "fielddata": true + "type": "integer" }, "standSortOrder": { "type": "integer" diff --git a/doc/es/es 创建索引字段_laws.txt b/doc/es/es 创建索引字段_laws.txt index ae65838f..d79b1110 100644 --- a/doc/es/es 创建索引字段_laws.txt +++ b/doc/es/es 创建索引字段_laws.txt @@ -6,6 +6,12 @@ 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 b0b3fe6a..95ff3a34 100644 --- a/doc/es/es 创建索引字段_stand.txt +++ b/doc/es/es 创建索引字段_stand.txt @@ -6,6 +6,12 @@ stand/stand/_mapping?pretty&include_type_name=true "standSortOrder": { "type": "integer" }, + "numberTitle": { + "type": "integer" + }, + "yearOrder": { + "type": "integer" + }, "BARQ": { "type": "text", "fields": {