fix(一般检索): 字段调整

db/es_index.json

@@ -148,6 +148,15 @@
                             "ignore_above": 256
                         }
                     }
+                },
+                "type": {
+                    "type": "text",
+                    "fields": {
+                        "keyword": {
+                            "type": "keyword",
+                            "ignore_above": 256
+                        }
+                    }
                 }
             }
         }

laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml

@@ -68,7 +68,7 @@
         select 'type' as field_name,type,count(*) from laws_domestic_standard
         <where>${ew.sqlSegment}</where> group by type
         union all
-        select 'applicable_market' as field_name,type,count(*) from laws_domestic_standard
+        select 'applicable_market' as field_name,applicable_market,count(*) from laws_domestic_standard
         <where>${ew.sqlSegment}</where> group by applicable_market
         union all
         select 'standard_state' as field_name,standard_state,count(*) from laws_domestic_standard

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -1051,8 +1051,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         listField.add(RESOURCE_TYPE);
         listField.add(STANDARD_CLASS);
         listField.add(DYNAMIC_TYPE);
-        listField.add("applicable_vehicle");
-        listField.add("standard_property");
+        listField.add("applicable_vehicle_type");
+        listField.add("type");
         listField.add(STANDARD_STATE);
         listField.add(CATEGORY_CODE);
         listField.add(ENTERPRISE_STANDARD_STATE);
@@ -1116,8 +1116,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                 List<LawsHomeNormalSearchCountVO> list1 = new ArrayList<>();
                 addVo(search, list1, "standard_class_aggs", STANDARD_CLASS);
                 addVo(search, list1, "dynamic_type_aggs", DYNAMIC_TYPE);
-                addVo(search, list1, "applicable_vehicle_aggs", APPLICABLE_VEHICLE);
-                addVo(search, list1, "standard_property_aggs", STANDARD_PROPERTY);
+                addVo(search, list1, "applicable_vehicle_type_aggs", APPLICABLE_VEHICLE);
+                addVo(search, list1, "type_aggs", STANDARD_PROPERTY);
                 addVo(search, list1, standardStateAggs, STANDARD_STATE);
                 addVo(search, list1, "applicable_market_aggs", "applicable_market");
                 count1(list1,objVo);
@@ -1914,6 +1914,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         map.put(STANDARD_STATE, "," + obj.getStandardState() + ",");
         map.put(STANDARD_CATEGORY_CODE,"," + obj.getCategoryCode() + ",");
         map.put(ENTERPRISE_STANDARD_STATE,"," + obj.getEnterpriseStandardState() + ",");
+        map.put("applicable_market","," + obj.getApplicableMarket() + ",");
         map.put("release_date",obj.getReleaseDate());
         // 没有时间 强行加入最早时间
         try {