From c716f5e886378f2a49e30ca5f836d03d22a8f9bf Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Sat, 7 Feb 2026 11:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ccumulateLineData.java => SubLineData.java} | 2 +- .../back/service/common/CommonOpt.java | 12 ++++++------ .../service/common/LineDataAggregator.java | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) rename dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/{AccumulateLineData.java => SubLineData.java} (95%) diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/AccumulateLineData.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/SubLineData.java similarity index 95% rename from dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/AccumulateLineData.java rename to dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/SubLineData.java index a2e250a..8e8d93e 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/AccumulateLineData.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/SubLineData.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; @Data -public class AccumulateLineData { +public class SubLineData { @Schema(description = "属性编码, 默认：single，温湿度设备：temperature或者humidity") private String attrCode; diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java index 1524384..3c9143b 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java @@ -25,7 +25,7 @@ import com.dongjian.dashboard.back.util.DateUtil; import com.dongjian.dashboard.back.util.DurationData; import com.dongjian.dashboard.back.vo.building.BindedBuildingVO; import com.dongjian.dashboard.back.vo.company.AuroraInfo; -import com.dongjian.dashboard.back.vo.device.AccumulateLineData; +import com.dongjian.dashboard.back.vo.device.SubLineData; import com.dongjian.dashboard.back.vo.device.DeviceIncrement; import com.dongjian.dashboard.back.vo.device.LineData; import com.dongjian.dashboard.back.vo.record.RecordAccumulateDto; @@ -295,7 +295,7 @@ public class CommonOpt { Double yesterdayBase = getDayAccumulate(conn, beforeYesterday, lineDataSearchParams.getDeviceId()); Double lastYearBase = getDayAccumulate(conn, lastYearPrev, lineDataSearchParams.getDeviceId()); - AccumulateLineData acc = new AccumulateLineData(); + SubLineData acc = new SubLineData(); acc.setAttrCode(lineData.getAttrCode()); processAccumulateDay(conn, current, todayBase, "today", acc, deviceInfo); @@ -376,10 +376,10 @@ public class CommonOpt { LocalDate date, Double baseValue, String yKey, - AccumulateLineData accumulateLineData, + SubLineData SubLineData, DeviceInfo deviceInfo) { - AccumulateLineData.childLineData childLineData = new AccumulateLineData.childLineData(); + SubLineData.childLineData childLineData = new SubLineData.childLineData(); String sql = "SELECT upload_value, upload_at FROM dashboard_record_accumulate " + @@ -387,7 +387,7 @@ public class CommonOpt { try (PreparedStatement ps = conn.prepareStatement(sql)) { ps.setString(1, deviceInfo.getDeviceId()); - ps.setString(2, accumulateLineData.getAttrCode()); + ps.setString(2, SubLineData.getAttrCode()); ps.setInt(3, date.getYear()); ps.setInt(4, date.getMonthValue()); ps.setInt(5, date.getDayOfMonth()); @@ -424,7 +424,7 @@ public class CommonOpt { logger.error("processAccumulateDay error", e); } - accumulateLineData.getSubData().put(yKey, childLineData); + SubLineData.getSubData().put(yKey, childLineData); } private Double getDayAccumulate(Connection conn, LocalDate date, String deviceId) { diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java index 5aa2b2f..db4961d 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java @@ -1,6 +1,6 @@ package com.dongjian.dashboard.back.service.common; -import com.dongjian.dashboard.back.vo.device.AccumulateLineData; +import com.dongjian.dashboard.back.vo.device.SubLineData; import com.dongjian.dashboard.back.vo.device.LineData; import java.time.LocalDate; @@ -219,14 +219,14 @@ public class LineDataAggregator { } /* =============================== - * AccumulateLineData -> LineData + * SubLineData -> LineData * 半小时取最后一条 * =============================== */ - public static void convertToLineDataHour(AccumulateLineData accumulate, LineData lineData) { + public static void convertToLineDataHour(SubLineData accumulate, LineData lineData) { if (accumulate == null || accumulate.getSubData() == null) return; Map seriesMap = new LinkedHashMap<>(); - for (Map.Entry entry : accumulate.getSubData().entrySet()) { + for (Map.Entry entry : accumulate.getSubData().entrySet()) { seriesMap.put(entry.getKey(), aggregateLastByHalfHour(entry.getValue())); } @@ -250,7 +250,7 @@ public class LineDataAggregator { fillTo48HalfHour(lineData); } - private static HalfHourSeries aggregateLastByHalfHour(AccumulateLineData.childLineData child) { + private static HalfHourSeries aggregateLastByHalfHour(SubLineData.childLineData child) { if (child == null || child.getXData() == null || child.getYData() == null) return new HalfHourSeries(null); @@ -307,19 +307,19 @@ public class LineDataAggregator { /* =============================== * 全量对齐 * =============================== */ - public static void convertToLineDataAll(AccumulateLineData accumulate, LineData lineData) { + public static void convertToLineDataAll(SubLineData accumulate, LineData lineData) { if (accumulate == null || accumulate.getSubData() == null) return; LinkedHashSet xSet = new LinkedHashSet<>(); - for (AccumulateLineData.childLineData child : accumulate.getSubData().values()) { + for (SubLineData.childLineData child : accumulate.getSubData().values()) { if (child.getXData() != null) xSet.addAll(child.getXData()); } List mergedX = new ArrayList<>(xSet); Map> tmpMap = new LinkedHashMap<>(); - for (Map.Entry entry : accumulate.getSubData().entrySet()) { + for (Map.Entry entry : accumulate.getSubData().entrySet()) { Map map = new LinkedHashMap<>(); - AccumulateLineData.childLineData child = entry.getValue(); + SubLineData.childLineData child = entry.getValue(); if (child.getXData() != null && child.getYData() != null) { int size = Math.min(child.getXData().size(), child.getYData().size()); for (int i = 0; i < size; i++) map.put(child.getXData().get(i), child.getYData().get(i));