junzhangfm/ai-china-southern-power-grid-new
1
0
Fork 0
forked from CSG/ai-china-southern-power-grid
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
junzhangfm 2026-04-14 15:17:56 +08:00
parent 95bff13881
commit ee27a7130b
2 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/southern/power/grid/entity/DailyChartYScaleRuleCollectVO.java
View File

@ -21,11 +21,31 @@ public class DailyChartYScaleRuleCollectVO implements Serializable {
*/
private ChartYScaleRuleVO maRule;
/**
* 故障停电 ma规则
*/
private ChartYScaleRuleVO faultMaRule;
/**
* 计划停电 ma规则
*/
private ChartYScaleRuleVO scheduledMaRule;
/**
* 停电影响用户总数
*/
private ChartYScaleRuleVO userCountRule;
/**
* 故障停电影响用户总数
*/
private ChartYScaleRuleVO faultUserCountRule;
/**
* 计划停电影响用户总数
*/
private ChartYScaleRuleVO scheduledUserCountRule;
/**
* 日累计降水量
*/
@ -36,6 +56,16 @@ public class DailyChartYScaleRuleCollectVO implements Serializable {
*/
private ChartYScaleRuleVO temperatureRule;
/**
* 最高气温
*/
private ChartYScaleRuleVO maxTemperatureRule;
/**
* 最低气温
*/
private ChartYScaleRuleVO minTemperatureRule;
/**
* 日极大风速
*/

40
src/main/java/com/southern/power/grid/service/impl/DnerDailyPowerOutageEventServiceImpl.java
View File

@ -67,36 +67,50 @@ public class DnerDailyPowerOutageEventServiceImpl
kLineList.addAll(result.getUserKline().getMa10());
kLineList.addAll(result.getUserKline().getMa20());
kLineList.addAll(result.getUserKline().getMa30());
if (!CollectionUtil.isEmpty(kLineList)) {
result.getDailyChartYScaleRuleCollect().setMaRule(ToolUtils.getRule(kLineList));
}
kLineList = new ArrayList<>();
result.getFaultUserKline().getKline().forEach(kLineList::addAll);
kLineList.addAll(result.getFaultUserKline().getMa5());
kLineList.addAll(result.getFaultUserKline().getMa10());
kLineList.addAll(result.getFaultUserKline().getMa20());
kLineList.addAll(result.getFaultUserKline().getMa30());
if (!CollectionUtil.isEmpty(kLineList)) {
result.getDailyChartYScaleRuleCollect().setFaultMaRule(ToolUtils.getRule(kLineList));
}
kLineList = new ArrayList<>();
result.getScheduledUserKline().getKline().forEach(kLineList::addAll);
kLineList.addAll(result.getScheduledUserKline().getMa5());
kLineList.addAll(result.getScheduledUserKline().getMa10());
kLineList.addAll(result.getScheduledUserKline().getMa20());
kLineList.addAll(result.getScheduledUserKline().getMa30());
if (!CollectionUtil.isEmpty(kLineList)) {
result.getDailyChartYScaleRuleCollect().setMaRule(ToolUtils.getRule(kLineList));
result.getDailyChartYScaleRuleCollect().setScheduledMaRule(ToolUtils.getRule(kLineList));
}
List<Integer> userCountList = new ArrayList<>();
userCountList.addAll(result.getUserCounts());
userCountList.addAll(result.getFaultUserCountList());
userCountList.addAll(result.getScheduledUserCountList());
if (!CollectionUtil.isEmpty(userCountList)) {
result.getDailyChartYScaleRuleCollect().setUserCountRule(ToolUtils.getRule(userCountList));
if (!CollectionUtil.isEmpty(result.getUserCounts())) {
result.getDailyChartYScaleRuleCollect().setUserCountRule(ToolUtils.getRule(result.getUserCounts()));
}
if (!CollectionUtil.isEmpty(result.getFaultUserCountList())) {
result.getDailyChartYScaleRuleCollect().setFaultUserCountRule(
ToolUtils.getRule(result.getFaultUserCountList()));
}
if (!CollectionUtil.isEmpty(result.getScheduledUserCountList())) {
result.getDailyChartYScaleRuleCollect().setScheduledUserCountRule(
ToolUtils.getRule(result.getScheduledUserCountList()));
}
if (!CollectionUtil.isEmpty(result.getCumulativeRain())) {
result.getDailyChartYScaleRuleCollect().setDailyPrecipitationRule(
ToolUtils.getRule(result.getCumulativeRain()));
}
List<Double> tempList = new ArrayList<>();
tempList.addAll(result.getAvgTemp());
tempList.addAll(result.getMaxTemp());
tempList.addAll(result.getMinTemp());
if (!CollectionUtil.isEmpty(tempList)) {
result.getDailyChartYScaleRuleCollect().setDailyPrecipitationRule(ToolUtils.getRule(tempList));
if (!CollectionUtil.isEmpty(result.getAvgTemp())) {
result.getDailyChartYScaleRuleCollect().setTemperatureRule(ToolUtils.getRule(result.getAvgTemp()));
}
if (!CollectionUtil.isEmpty(result.getMaxTemp())) {
result.getDailyChartYScaleRuleCollect().setMaxTemperatureRule(ToolUtils.getRule(result.getMaxTemp()));
}
if (!CollectionUtil.isEmpty(result.getMinTemp())) {
result.getDailyChartYScaleRuleCollect().setMinTemperatureRule(ToolUtils.getRule(result.getMinTemp()));
}
if (!CollectionUtil.isEmpty(result.getWindSpeed())) {
result.getDailyChartYScaleRuleCollect().setExtremeWindSpeedRule(ToolUtils.getRule(result.getWindSpeed()));