jwy
/
aeon_dashboard_back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

计测设备，增加前日、前年数据

zhc
review512jwy@163.com 3 weeks ago
parent
c716f5e886
commit
356273f74d
2 changed files with 139 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java
  2. 124
      dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java

78
dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java
View File

@ -302,7 +302,7 @@ public class CommonOpt {
if (searchType == 1) { if (searchType == 1) {
processAccumulateDay(conn, yesterday, yesterdayBase, "yesterday", acc, deviceInfo); processAccumulateDay(conn, yesterday, yesterdayBase, "yesterday", acc, deviceInfo);
processAccumulateDay(conn, lastYear, lastYearBase, "lastYear", acc, deviceInfo); processAccumulateDay(conn, lastYear, lastYearBase, "lastYear", acc, deviceInfo);
LineDataAggregator.convertToLineDataHour(acc, lineData); LineDataAggregator.convertToAccumulateLineData(acc, lineData);
} else { } else {
LineDataAggregator.convertToLineDataAll(acc, lineData); LineDataAggregator.convertToLineDataAll(acc, lineData);
} }
@ -471,38 +471,76 @@ public class CommonOpt {
List<String> dateList = getPreDay(1); List<String> dateList = getPreDay(1);
for (String date : dateList) { for (String date : dateList) {
LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy_MM_dd")); LocalDate today = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy_MM_dd"));
LocalDate yesterday = today.minusDays(1);
LocalDate lastYear = DateUtil.getLastYearSameIsoWeekDay(today);
SubLineData sub = new SubLineData();
sub.setAttrCode(lineData.getAttrCode());
processMeasureDay(conn, today, "today", sub, deviceInfo);
if (searchType == 1) {
processMeasureDay(conn, yesterday, "yesterday", sub, deviceInfo);
processMeasureDay(conn, lastYear, "lastYear", sub, deviceInfo);
LineDataAggregator.convertToMeasureLineDataAvg(sub, lineData);
} else {
LineDataAggregator.convertToLineDataAll(sub, lineData);
}
}
});
return list;
}
private void processMeasureDay(
Connection conn,
LocalDate date,
String yKey,
SubLineData sub,
DeviceInfo deviceInfo
) {
SubLineData.childLineData child = new SubLineData.childLineData();
String sql = "SELECT upload_value, upload_at FROM dashboard_record_measure " + String sql = "SELECT upload_value, upload_at FROM dashboard_record_measure " +
"WHERE device_id = ? AND attr_code = ? AND date_year = ? AND date_month = ? AND date_day = ? ORDER BY id"; "WHERE device_id = ? AND attr_code = ? " +
"AND date_year = ? AND date_month = ? AND date_day = ? ORDER BY id";
try (PreparedStatement ps = conn.prepareStatement(sql)) { try (PreparedStatement ps = conn.prepareStatement(sql)) {
ps.setString(1, lineDataSearchParams.getDeviceId()); ps.setString(1, deviceInfo.getDeviceId());
ps.setString(2, lineData.getAttrCode()); ps.setString(2, sub.getAttrCode());
ps.setInt(3, localDate.getYear()); ps.setInt(3, date.getYear());
ps.setInt(4, localDate.getMonthValue()); ps.setInt(4, date.getMonthValue());
ps.setInt(5, localDate.getDayOfMonth()); ps.setInt(5, date.getDayOfMonth());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { DateTimeFormatter formatter = Constants.FORMATTER_YMDHMS;
processResult(rs, lineData, deviceInfo);
while (rs.next()) {
long ts = rs.getLong("upload_at");
String value = rs.getString("upload_value");
if (ts == 0) continue;
String time = Instant.ofEpochMilli(ts)
.atZone(Constants.ZONE_TOKYO)
.toLocalDateTime()
.format(formatter);
child.getXData().add(time);
child.getYData().add(
CommonUtil.formatDecimal(
StringUtils.isBlank(value) ? "0" : value,
deviceInfo.getDashboardDecimalPlaces()
)
);
} }
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("process measure data error", e); logger.error("processMeasureDay error", e);
} }
}
});
if (searchType == 1) { sub.getSubData().put(yKey, child);
list.forEach(ld -> {
LineDataAggregator.aggregateAverageByHalfHour(ld);
LineDataAggregator.fillTo48HalfHour(ld);
});
} }
return list;
}
private void processResult(ResultSet result, LineData lineData, DeviceInfo deviceInfo) { private void processResult(ResultSet result, LineData lineData, DeviceInfo deviceInfo) {
try { try {

124
dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java
View File

@ -149,80 +149,100 @@ public class LineDataAggregator {
return LocalDateTime.parse(String.valueOf(x), TimeAxisUtil.DATETIME_FMT); return LocalDateTime.parse(String.valueOf(x), TimeAxisUtil.DATETIME_FMT);
} }
/* =============================== public static void convertToMeasureLineDataAvg(SubLineData accumulate, LineData lineData) {
* 按小时聚合（平均值） if (accumulate == null || accumulate.getSubData() == null) return;
* =============================== */
public static void aggregateByHour(LineData lineData) {
aggregateByHourOrHalfHour(lineData, new AvgCollector(), true);
}
/* =============================== // 1. 每个 series 做「半小时平均」
* 按半小时聚合（平均值） Map<String, HalfHourSeries> seriesMap = new LinkedHashMap<>();
* =============================== */ for (Map.Entry<String, SubLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
public static void aggregateAverageByHalfHour(LineData lineData) { seriesMap.put(entry.getKey(), aggregateAvgByHalfHour(entry.getValue()));
aggregateByHourOrHalfHour(lineData, new AvgCollector(), false);
} }
/* 公共聚合方法 */ // 2. today 作为 X 轴基准
private static <T> void aggregateByHourOrHalfHour( HalfHourSeries today = seriesMap.get("today");
LineData lineData, if (today == null) {
HalfHourCollector<T> collector, throw new IllegalStateException("subData 必须包含 today");
boolean byHour }
) {
if (lineData == null) return;
List<String> xData = lineData.getXData(); // 3. 构建最终 X（yyyy-MM-dd HH:mm:00）
Map<String, List<Object>> yDataMap = lineData.getYData(); List<String> finalX = new ArrayList<>();
if (xData == null || xData.isEmpty() || yDataMap == null || yDataMap.isEmpty()) return; for (String hm : today.xList) {
finalX.add(today.date + " " + hm + ":00");
}
Set<String> allSeriesKeys = yDataMap.keySet(); // 4. 构建临时 map，用 today.xList 对齐
Map<String, Map<String, Object>> tmpMap = new HashMap<>();
for (Map.Entry<String, HalfHourSeries> entry : seriesMap.entrySet()) {
tmpMap.put(entry.getKey(), entry.getValue().toMap());
}
Map<String, Map<String, T>> bucket = new TreeMap<>(); // 5. 写入 LineData
for (int i = 0; i < xData.size(); i++) { lineData.setXData(finalX);
LocalDateTime time = parseTime(xData.get(i)); lineData.setYData(LineDataAligner.alignY(today.xList, tmpMap));
String key = byHour ? TimeAxisUtil.hourKey(time) : TimeAxisUtil.halfHourKey(time); lineData.setAttrCode(accumulate.getAttrCode());
for (String series : allSeriesKeys) { // 6. 补齐 48 半小时
Object yVal = safeGet(yDataMap.get(series), i); fillTo48HalfHour(lineData);
if (yVal == null) continue; }
bucket.computeIfAbsent(key, k -> new HashMap<>()); private static HalfHourSeries aggregateAvgByHalfHour(SubLineData.childLineData child) {
collector.collect(bucket.get(key), series, time, yVal); if (child == null || child.getXData() == null || child.getYData() == null) {
return new HalfHourSeries(null);
} }
Map<String, List<Double>> bucket = new HashMap<>();
String date = null;
int size = Math.min(child.getXData().size(), child.getYData().size());
for (int i = 0; i < size; i++) {
Object x = child.getXData().get(i);
Object y = child.getYData().get(i);
if (x == null || y == null) continue;
LocalDateTime time;
try {
time = LocalDateTime.parse(x.toString(), TimeAxisUtil.DATETIME_FMT);
} catch (Exception e) {
continue;
} }
// 构建临时 Map 用于统一对齐 if (date == null) {
Map<String, Map<String, Object>> tmpMap = new HashMap<>(); date = time.toLocalDate().toString();
boolean isAvg = collector instanceof AvgCollector; }
for (Map.Entry<String, Map<String, T>> entry : bucket.entrySet()) { double num;
String xKey = entry.getKey(); try {
Map<String, T> seriesMap = entry.getValue(); num = Double.parseDouble(y.toString());
for (String series : allSeriesKeys) { } catch (Exception e) {
Object val; // 非数字直接丢
T tVal = seriesMap.get(series); continue;
if (isAvg && tVal instanceof List) {
List<Double> list = (List<Double>) tVal;
val = list.stream().mapToDouble(Double::doubleValue).average().orElse(0);
} else if (!isAvg && tVal instanceof TimeValue) {
val = ((TimeValue) tVal).value;
} else {
val = tVal;
} }
tmpMap.computeIfAbsent(series, k -> new HashMap<>()).put(xKey, val);
String hm = TimeAxisUtil.alignToHalfHour(time.toLocalTime()); // HH:mm
bucket.computeIfAbsent(hm, k -> new ArrayList<>()).add(num);
} }
List<String> sortedHM = new ArrayList<>(bucket.keySet());
Collections.sort(sortedHM);
List<Object> values = new ArrayList<>();
for (String hm : sortedHM) {
List<Double> list = bucket.get(hm);
double avg = list.stream().mapToDouble(Double::doubleValue).average().orElse(0D);
values.add(avg);
} }
List<String> newX = new ArrayList<>(bucket.keySet()); return new HalfHourSeries(date, sortedHM, values);
lineData.setXData(newX);
lineData.setYData(LineDataAligner.alignY(newX, tmpMap));
} }
/* =============================== /* ===============================
* SubLineData -> LineData * SubLineData -> LineData
* 半小时取最后一条 * 半小时取最后一条
* =============================== */ * =============================== */
public static void convertToLineDataHour(SubLineData accumulate, LineData lineData) { public static void convertToAccumulateLineData(SubLineData accumulate, LineData lineData) {
if (accumulate == null || accumulate.getSubData() == null) return; if (accumulate == null || accumulate.getSubData() == null) return;
Map<String, HalfHourSeries> seriesMap = new LinkedHashMap<>(); Map<String, HalfHourSeries> seriesMap = new LinkedHashMap<>();

Write Preview
Loading…
Cancel
Save