修改统计逻辑

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceMessageStatController.java

@@ -48,6 +48,8 @@ public class DeviceMessageStatController extends BaseCRUDJsonBodyMappingControll
         List<DeviceMessageStatEntity> statEntities = (List<DeviceMessageStatEntity>) model.get(KEY_RESULT_DATA);
         //重新分组返回  [{date:2024-8}]
         if (!ObjectUtils.isEmpty(statEntities)) {
+
+
             //按月分组
             Map<Integer, Map<String, List<DeviceMessageStatEntity>>> collect = statEntities.stream()
                     .collect(Collectors.groupingBy(DeviceMessageStatEntity::getMonth, Collectors.groupingBy(DeviceMessageStatEntity::getProductName,
@@ -62,6 +64,9 @@ public class DeviceMessageStatController extends BaseCRUDJsonBodyMappingControll
             } else {
                 productEntities = productService.find(new ProductEntity());
             }
+
+            String month = query.getGroupList().stream().filter(f -> "month".equals(f)).findFirst().orElseGet(() -> null);
+            if (!ObjectUtils.isEmpty(month)) {
                 for (int i = 1; i <= 12; i++) {
                     if (!collect.containsKey(i)) {
                         Map<String, List<DeviceMessageStatEntity>> map = new HashMap<>();
@@ -76,6 +81,7 @@ public class DeviceMessageStatController extends BaseCRUDJsonBodyMappingControll
                         monthStat.put(i, 0);
                     }
                 }
+            }
             model.put("stat", collect);
             model.put("monthStat", monthStat);