update 周统计 周数改为计算一年周数

nb-system/src/main/java/com/nb/bus/enums/StatsTimeUnit.java

@@ -1,11 +1,12 @@
 package com.nb.bus.enums;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.annotation.IEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -28,7 +29,7 @@ public enum  StatsTimeUnit implements IEnum<Integer> {
         @Override
         public String parse(Date date) {
             String prefix= DateUtil.format(date, "yyyy年");
-            return prefix+"第"+DateUtil.weekOfMonth(date)+"周("+DateUtil.formatDate(DateUtil.beginOfWeek(date))+"-"+DateUtil.formatDate(DateUtil.beginOfWeek(date))+")";
+            return prefix+"第"+DateUtil.weekOfYear(date)+"周\n("+DateUtil.formatDate(DateUtil.beginOfWeek(date))+"-"+DateUtil.formatDate(DateUtil.endOfWeek(date))+")";
         }
     },
     MONTH(3){
@@ -49,4 +50,11 @@ public enum  StatsTimeUnit implements IEnum<Integer> {
      */
     public abstract String parse(Date date);
 
+
+    public static void main(String[] args) {
+        System.out.println(DateUtil.beginOfWeek(new Date()));
+        System.out.println(DateUtil.endOfWeek(new Date()));
+        System.out.println(DateUtil.beginOfWeek(DateUtil.yesterday()));
+        System.out.println(DateUtil.endOfWeek(DateUtil.yesterday()));
+    }
 }

nb-system/src/main/java/com/nb/bus/stats/CommonStats.java

@@ -68,6 +68,7 @@ public interface CommonStats<T extends CombineResult> {
 
 
     default Map<String, List<T>> groupByTime(List<T> results, StatsTimeUnit unit){
+        results.sort((s1,s2)->s2.getInfusionStartTime().compareTo(s1.getInfusionStartTime()));
         Map<String, List<T>> result = new LinkedHashMap<>();
         results.forEach(combineResult->{
             combineResult.setTimeParseResult(unit.parse(combineResult.getInfusionStartTime()));

nb-system/src/main/java/com/nb/bus/stats/analyse/AlarmStatsAnalyse.java

@@ -247,7 +247,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
         result.setContent(contents);
         result.setColumn(allColumn);
         //根据时间区间对镇痛方式进行统计
-        Map<String, AlarmTotalPieResult> groupByTimeCountResult = new HashMap<>();
+        Map<String, AlarmTotalPieResult> groupByTimeCountResult = new LinkedHashMap<>();
         //根据时间区间对镇痛方式进行统计
         groupByTimeResults.forEach((timeRange,combineResults)->{
             AlarmTotalPieResult alarmTotalPieResult = groupByTimeCountResult.computeIfAbsent(timeRange, k -> new AlarmTotalPieResult(addIntelligentParam()));