bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -493,9 +494,10 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "故障记录API")
     @GetMapping("/alarmEventtList")
     public ResponseModel<ResultsData> getAlarmEventList(@RequestParam(value = "current") int current,
-                                                             @RequestParam(value = "size") int size,
-                                                             @RequestParam(value = "stationId") String stationId,
-                                                        @RequestParam(value = "type") String type) {
+                                                        @RequestParam(value = "size") int size,
+                                                        @RequestParam(value = "stationId") String stationId,
+                                                        @RequestParam(value = "type", required = false) String type) {
+        type = StrUtil.isEmpty(type) ? "0" : type;
         ResultsData resultsData = new ResultsData();
         if (type.equals("0")){
             resultsData = monitorFanIndicatorImpl.getAlarmEventList(current, size, stationId);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1556,7 +1556,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList(frontModule));
         List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-        List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getEquipmentNumber().equals("")).collect(Collectors.toList());
+        List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getEquipmentNumber().equals("")).sorted(Comparator.comparing(ESEquipments::getEquipmentNumber)).collect(Collectors.toList());
         if (null != equipmentNumber) {
             listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getEquipmentNumber().contains(equipmentNumber)).collect(Collectors.toList());
         }