2026-04-13提交：K线图的Y轴规则

src/main/java/com/southern/power/grid/entity/DailyPowerOutageEventVO.java

@@ -104,7 +104,7 @@ public class DailyPowerOutageEventVO {
                 .setMa20(new ArrayList<>()).setMa30(new ArrayList<>());
         scheduledUserKline = new KLineVO().setKline(new ArrayList<>()).setMa5(new ArrayList<>()).setMa10(new ArrayList<>())
                 .setMa20(new ArrayList<>()).setMa30(new ArrayList<>());
-        ChartYScaleRuleVO chartYScaleRuleVO = new ChartYScaleRuleVO().setMin(0).setMax(100).setInterval(10.0);
+        ChartYScaleRuleVO chartYScaleRuleVO = new ChartYScaleRuleVO().setMin(0).setMax(0).setInterval(0D);
         dailyChartYScaleRuleCollect = new DailyChartYScaleRuleCollectVO().setMaRule(chartYScaleRuleVO)
                 .setUserCountRule(chartYScaleRuleVO).setDailyPrecipitationRule(chartYScaleRuleVO)
                 .setTemperatureRule(chartYScaleRuleVO).setExtremeWindSpeedRule(chartYScaleRuleVO);

src/main/java/com/southern/power/grid/entity/HourlyChartYScaleRuleCollectVO.java

@@ -16,6 +16,11 @@ import java.io.Serializable;
 public class HourlyChartYScaleRuleCollectVO implements Serializable {
     private static final long serialVersionUID = -6099537585608567152L;
 
+    /**
+     * 小时停电用户数
+     */
+    private ChartYScaleRuleVO userCountRule;
+
     /**
      * 小时故障停电用户数
      */

src/main/java/com/southern/power/grid/entity/HourlyPowerOutageEventChartVO.java

@@ -77,10 +77,10 @@ public class HourlyPowerOutageEventChartVO {
         minTemList = new ArrayList<>();
         precList = new ArrayList<>();
         windList = new ArrayList<>();
-        ChartYScaleRuleVO chartYScaleRuleVO = new ChartYScaleRuleVO().setMin(0).setMax(100).setInterval(10.0);
+        ChartYScaleRuleVO chartYScaleRuleVO = new ChartYScaleRuleVO().setMin(0).setMax(0).setInterval(0D);
         hourlyChartYScaleRuleCollect = new HourlyChartYScaleRuleCollectVO().setPrecRule(chartYScaleRuleVO)
                 .setAvgTemRule(chartYScaleRuleVO).setMaxTemRule(chartYScaleRuleVO).setMinTemRule(chartYScaleRuleVO)
                 .setWindRule(chartYScaleRuleVO).setScheduledUserCountRule(chartYScaleRuleVO)
-                .setFaultUserCountRule(chartYScaleRuleVO);
+                .setFaultUserCountRule(chartYScaleRuleVO).setUserCountRule(chartYScaleRuleVO);
     }
 }

src/main/java/com/southern/power/grid/service/impl/DnerHourlyPowerOutageEventServiceImpl.java

@@ -72,6 +72,10 @@ public class DnerHourlyPowerOutageEventServiceImpl
     }
 
     private void handleYScaleRule(HourlyPowerOutageEventChartVO result) {
+        if (!CollectionUtil.isEmpty(result.getPowerOutageUserCountList())) {
+            result.getHourlyChartYScaleRuleCollect().setUserCountRule(
+                    ToolUtils.getRule(result.getPowerOutageUserCountList()));
+        }
         if (!CollectionUtil.isEmpty(result.getFaultUserCountList())) {
             result.getHourlyChartYScaleRuleCollect().setFaultUserCountRule(
                     ToolUtils.getRule(result.getFaultUserCountList()));

src/main/java/com/southern/power/grid/utils/ToolUtils.java

@@ -16,7 +16,6 @@ public class ToolUtils {
         if (first instanceof Integer) {
             int min = list.stream().mapToInt(Number::intValue).min().orElse(0);
             int max = list.stream().mapToInt(Number::intValue).max().orElse(0);
-            max = max == 0 ? 100 : max;
             double interval = Math.round((double) (max - min) / 10 * 10) / 10.0;
             return new ChartYScaleRuleVO().setMin(min).setMax(max).setInterval(interval);
         } else if (first instanceof Double) {
@@ -24,7 +23,6 @@ public class ToolUtils {
             int floorMin = (int) Math.floor(min);
             double max = list.stream().mapToDouble(Number::doubleValue).max().orElse(0);
             int ceilMax = (int) Math.ceil(max);
-            ceilMax = ceilMax == 0 ? 100 : ceilMax;
             double interval = Math.round((double) (ceilMax - floorMin) / 10 * 10) / 10.0;
             return new ChartYScaleRuleVO().setMin(floorMin).setMax(ceilMax).setInterval(interval);
         } else {