Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 新需求 添加查询ES详情接口 文本分词高亮显示全部内容

See merge request LiuChao/foton-slrs-system-rest!528

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());

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());

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())) {

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",

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"

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": {

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": {