From 403eed51f3687479448ef31028004ee6f04e7bdc Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 09 九月 2026 18:07:30 +0800
Subject: [PATCH] 补充化成列表版本号以支持独立导出权限
---
ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java | 1 +
battery-business/src/main/java/com/battery/business/report/FormationReportService.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationReportService.java b/battery-business/src/main/java/com/battery/business/report/FormationReportService.java
index 46d5016..9fc3810 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationReportService.java
+++ b/battery-business/src/main/java/com/battery/business/report/FormationReportService.java
@@ -51,16 +51,17 @@
Map<String, Map<String, BigDecimal>> metrics, List<CurrentBatteryField> businessFields,
Map<Integer, List<ChargeStep>> chargeSteps, Map<Integer, Curve> curves, Map<Integer, Map<Integer, Curve>> stepCurves) { }
public record Matrix(List<Item> items, List<Integer> cycleNos) { }
- public record Summary(long id, String name, String creator, long createdAt, String testName, String batteryGroup) { }
+ public record Summary(long id, String name, String creator, long createdAt, String testName, String batteryGroup, int versionNo) { }
/** 列表来源名称取自已保存版本，测试删除后仍保留筛选与识别信息。 */
public List<Summary> list()
{
return reports.list().stream().map(summary -> {
- var sources = items(JSON.parseObject(reports.get(summary.id()).snapshotJson()));
+ var version = reports.get(summary.id());
+ var sources = items(JSON.parseObject(version.snapshotJson()));
return new Summary(summary.id(), summary.name(), summary.creator(), summary.createdAt(),
String.join("、", sources.stream().map(item -> item.source().name()).distinct().toList()),
- String.join("、", sources.stream().map(item -> item.source().batteryGroup()).distinct().toList()));
+ String.join("、", sources.stream().map(item -> item.source().batteryGroup()).distinct().toList()), version.versionNo());
}).toList();
}
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
index d2b212e..29922a8 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
@@ -71,6 +71,7 @@
assertEquals(250, values.getBigDecimal("1|11|1|capacity1v").intValueExact());
assertEquals(50, values.getBigDecimal("1|11|1|capacity1vf").intValueExact());
assertEquals(5, saved.getJSONArray("items").getJSONObject(0).getJSONArray("businessFields").size());
+ assertEquals(1, service.list().get(0).versionNo());
clearInvocations(tests, data);
assertEquals(values, JSON.parseObject(JSON.toJSONString(service.get(saved.getLongValue("id"), null))).getJSONObject("calculatedValues"));
verifyNoInteractions(tests, data);
--
Gitblit v1.7.1