Browse Source

井筒-领域检索

xiaoqiao 1 year ago
parent
commit
bb4e32e403

+ 3 - 3
.idea/compiler.xml

@@ -6,16 +6,16 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="smartsearch" />
+        <module name="cloudphone" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="smartsearch" target="17" />
+      <module name="cloudphone" target="17" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="smartsearch" options="-parameters" />
+      <module name="cloudphone" options="-parameters" />
     </option>
   </component>
 </project>

+ 1 - 1
.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/smartsearch.iml" filepath="$PROJECT_DIR$/.idea/smartsearch.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/cloudphone.iml" filepath="$PROJECT_DIR$/.idea/cloudphone.iml" />
     </modules>
   </component>
 </project>

+ 3 - 3
src/main/java/com/bowintek/practice/controller/PositionController.java

@@ -49,7 +49,7 @@ public class PositionController {
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
             data.setTitles(Arrays.asList(new String[]{"实习学年", "年级专业", "基地类型", "单位名称", "岗位名称", "岗位数量", "备注"}));
 
-            List<List<Object>> rowDatas = new ArrayList();
+            List<List<Object>> rowData = new ArrayList();
             for (PositionModel item : result.getList()) {
                 List<Object> row = new ArrayList();
                 row.add(item.schoolYear);
@@ -60,10 +60,10 @@ public class PositionController {
                 row.add(item.getQty());
                 row.add(item.getRemark());
 
-                rowDatas.add(row);
+                rowData.add(row);
             }
 
-            data.setRows(rowDatas);
+            data.setRows(rowData);
             excelHelper.exportExcel(response, data);
 
             return null;

+ 3 - 1
src/main/java/com/bowintek/practice/services/impl/EsQueryServiceImpl.java

@@ -2,6 +2,7 @@ package com.bowintek.practice.services.impl;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
 import co.elastic.clients.elasticsearch._types.aggregations.Buckets;
 import co.elastic.clients.elasticsearch._types.aggregations.StringTermsAggregate;
@@ -168,7 +169,8 @@ public class EsQueryServiceImpl implements EsQueryService {
             }
             //==>高亮设置
             searchRequest.highlight(h->h.fields("*", f->f.matchedFields("*")));
-
+            //排序
+            //searchRequest.sort(f->f.field(v->v.field("well_id").order(SortOrder.Asc)));
             //查询后分组
             searchRequest.aggregations("group_well",a->a.terms(t->t.field("well_id.keyword")));
             //[5]Es发起查询

+ 1 - 0
src/main/resources/application.yml

@@ -105,6 +105,7 @@ mybatis:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 pagehelper:
+  helperDialect: postgresql
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql

+ 1 - 0
target/classes/application.yml

@@ -105,6 +105,7 @@ mybatis:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 pagehelper:
+  helperDialect: postgresql
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql

BIN
target/classes/com/bowintek/practice/controller/PositionController.class