FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: There is no way the, 个别字段数据不规整 没法排序

Browse Source
This commit is contained in:
super_liu
2022-06-17 16:24:57 +08:00
parent 7f36f4899e
commit fdfb696dd9
8 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+3 -3
View File
@@ -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")));
adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+1 -3
View File
@@ -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());
adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java
-2
View File
@@ -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());
adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
-2
View File
@@ -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())) {
doc/es/es 创建索引字段_bussioness.txt
-6
View File
@@ -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",
doc/es/es 创建索引字段_fulltextserch.txt
+18 -2
View File
@@ -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"
doc/es/es 创建索引字段_laws.txt
-6
View File
@@ -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": {
doc/es/es 创建索引字段_stand.txt
-6
View File
@@ -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": {