修复es8数据查询排序不生效的问题

liachuan · Feb 24, 2023 · be498b7 · be498b7
1 parent 0ca112e
commit be498b7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/...urne-monitor/src/main/java/com/autohome/frostmourne/monitor/controller/LogController.java b/...urne-monitor/src/main/java/com/autohome/frostmourne/monitor/controller/LogController.java
@@ -27,7 +27,7 @@ public class LogController {
     @RequestMapping(value = "/findAlarmLog", method = RequestMethod.GET)
     public Protocol<PagerContract<AlarmLog>> findAlarmLog(@RequestParam(value = "pageIndex") int pageIndex, @RequestParam(value = "pageSize") int pageSize,
         @RequestParam(value = "startTime", required = false) Date startTime, @RequestParam(value = "endTime", required = false) Date endTime,
-        @RequestParam(value = "alarmId", required = false) Long alarmId, @RequestParam(value = "alert", required = false) VerifyResult verifyResult,
+        @RequestParam(value = "alarmId", required = false) Long alarmId, @RequestParam(value = "verifyResult", required = false) VerifyResult verifyResult,
         @RequestParam(value = "executeResult", required = false) ExecuteStatus executeResult, @RequestParam(value = "alert", required = false) Boolean alert) {
         PagerContract<AlarmLog> pagerContract = logService.findAlarmLog(pageIndex, pageSize, startTime, endTime, alarmId, verifyResult, executeResult, alert);
         return new Protocol<>(pagerContract);

diff --git a/...ava/com/autohome/frostmourne/monitor/dao/elasticsearch/Elasticsearch8ClientContainer.java b/...ava/com/autohome/frostmourne/monitor/dao/elasticsearch/Elasticsearch8ClientContainer.java
@@ -7,6 +7,8 @@
 import java.util.Map;
 
 import co.elastic.clients.elasticsearch._types.ExpandWildcard;
+import co.elastic.clients.elasticsearch._types.SortOptions;
+import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
@@ -151,6 +153,23 @@ public ElasticsearchDataResult query(DataNameContract dataNameContract, DateTime
                             .size(50)
                             .query(query)
                             .scroll(Time.of(t -> t.time("10m")));
+                    if(sortOrder.equalsIgnoreCase("asc")) {
+                        q.sort(SortOptions.of(
+                                s ->
+                                        s.field(b ->
+                                                b.field(dataNameContract.getTimestampField())
+                                                        .order(SortOrder.Asc)
+                                        )
+                        ));
+                    } else {
+                        q.sort(SortOptions.of(
+                                s ->
+                                        s.field(b ->
+                                                b.field(dataNameContract.getTimestampField())
+                                                        .order(SortOrder.Desc)
+                                        )
+                        ));
+                    }
                     if(intervalInSeconds != 0 && intervalInSeconds > 0) {
                         q.aggregations("dateHistogram", a -> a
                                 .dateHistogram(d -> d
@@ -163,6 +182,8 @@ public ElasticsearchDataResult query(DataNameContract dataNameContract, DateTime
                                 )
                         );
                     }
+
+
                     return q;
                 }, Object.class);
             } else {

diff --git a/frostmourne-vue/src/views/alarm/alarm-log.vue b/frostmourne-vue/src/views/alarm/alarm-log.vue
@@ -12,16 +12,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('alarm.alarmLog.label_execute_time') + ':'">
-              <el-date-picker v-model="datePickValue" type="datetimerange" :picker-options="pickerOptions" range-separator="To" :start-placeholder="$t('alarm.alarmLog.label_start_date')" 
+              <el-date-picker v-model="datePickValue" type="datetimerange" :picker-options="pickerOptions" range-separator="To" :start-placeholder="$t('alarm.alarmLog.label_start_date')"
               :end-placeholder="$t('alarm.alarmLog.label_end_date')" align="right" :default-time="['00:00:00', '23:59:59']" @change="dateChangeHandler" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('alarm.alarmLog.label_is_alert') + ':'">
               <el-select v-model="form.verifyResult" :placeholder="$t('alarm.alarmLog.label_is_alert')">
                 <el-option :label="$t('alarm.alarmLog.label_all')" value="" />
-                <el-option :label="$t('alarm.alarmLog.label_yes')" value="true" />
-                <el-option :label="$t('alarm.alarmLog.label_no')" value="false" />
+                <el-option :label="$t('alarm.alarmLog.label_yes')" value="TRUE" />
+                <el-option :label="$t('alarm.alarmLog.label_no')" value="FALSE" />
               </el-select>
             </el-form-item>
           </el-col>