改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java

@@ -85,7 +85,7 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
         if (null == top) {
             finalVoList = fireStationInfoList.stream().skip(0).sorted(Comparator.comparing(FireStationInfoDto::getAlarmNum).reversed()).collect(Collectors.toList());
         } else {
-            finalVoList = fireStationInfoList.stream().skip(0).limit(top).sorted(Comparator.comparing(FireStationInfoDto::getAlarmNum).reversed()).collect(Collectors.toList());
+            finalVoList = fireStationInfoList.stream().skip(0).sorted(Comparator.comparing(FireStationInfoDto::getAlarmNum).reversed()).limit(top).collect(Collectors.toList());
         }
         return finalVoList;
     }
@@ -95,7 +95,7 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
         String year = DateUtil.format(date, "YYYY");
         String currentMonth = DateUtil.format(date, DatePattern.NORM_MONTH_PATTERN);
         String yesterday = DateUtil.format(DateUtil.offsetDay(date, -1), DatePattern.NORM_DATE_PATTERN);
-        Integer todayNum = this.baseMapper.queryAlarmCountByDateAndCode(stationCode, DateUtil.now());
+        Integer todayNum = this.baseMapper.queryAlarmCountByDateAndCode(stationCode, DateUtil.today());
         Integer currentYearNum = this.baseMapper.queryAlarmCountByDateAndCode(stationCode, year);
         Integer currentMonthNum = this.baseMapper.queryAlarmCountByDateAndCode(stationCode, currentMonth);
         Integer yesterdayNum = this.baseMapper.queryAlarmCountByDateAndCode(stationCode, yesterday);