From 1f4ce3854c9160a2bd85345c5bcf7e8cf6e59160 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期二, 08 九月 2026 16:29:06 +0800
Subject: [PATCH] 解决化成工步曲线集成冲突
---
battery-business/src/main/java/com/battery/business/report/FormationReportService.java | 147 +++++++++++++++++++++++++++++++-----------------
1 files changed, 95 insertions(+), 52 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 ade8f19..6cd9d20 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
@@ -14,11 +14,12 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONWriter;
+import com.battery.device.api.StepDirectionResolver;
+import com.battery.device.api.StepDirectionResolver.Direction;
import com.battery.business.domain.CurrentBatteryField;
import com.battery.business.domain.TBatteryGroupField;
import com.battery.business.domain.TTest;
import com.battery.business.domain.TTestBattery;
-import com.battery.business.domain.TTestConsoleDetail;
import com.battery.business.report.FormationReportRequest.Selection;
import com.battery.business.report.FormationReportRequest.Settings;
import com.battery.business.service.ITBatteryGroupFieldService;
@@ -32,21 +33,22 @@
@Service
public class FormationReportService
{
+ private final StepDirectionResolver directions;
private final ITTestService tests;
private final ITestDataQueryService data;
private final FormationReportRepository reports;
private final ITBatteryGroupFieldService definitions;
public FormationReportService(ITTestService tests, ITestDataQueryService data,
- FormationReportRepository reports, ITBatteryGroupFieldService definitions)
- { this.tests = tests; this.data = data; this.reports = reports; this.definitions = definitions; }
+ FormationReportRepository reports, ITBatteryGroupFieldService definitions, StepDirectionResolver directions)
+ { this.directions = directions; this.tests = tests; this.data = data; this.reports = reports; this.definitions = definitions; }
- public record Candidate(Selection selection, String name, String type, long groupId, String batteryGroup, String batteryNo, TTestConsoleDetail consoleDetail) { }
- public record ChargeStep(int stepNo, String name, String stepType, BigDecimal endVoltage) { }
+ public record Candidate(Selection selection, String name, String type, long groupId, String batteryGroup, String batteryNo) { }
+ public record ChargeStep(int stepNo, String name, String stepType, BigDecimal endVoltage, Direction direction) { }
public record Curve(Long zeroTime, List<Map<String, Object>> records) { }
public record Item(Candidate source, List<Integer> cycleNos, List<Map<String, Object>> cycles,
Map<String, Map<String, BigDecimal>> metrics, List<CurrentBatteryField> businessFields,
- Map<Integer, List<ChargeStep>> chargeSteps, Map<Integer, Curve> curves) { }
+ 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) { }
@@ -95,7 +97,7 @@
var actual = Stream.of(rows, realtime,
batteryRows(steps.computeIfAbsent(selection.testId(), data::steps), battery)).flatMap(List::stream)
.map(this::cycleNo).filter(no -> no > 0).distinct().sorted().toList();
- items.add(new Item(candidate(test, battery), actual, rows, metrics(rows, actual), battery.getFields(), chargeSteps(steps.get(selection.testId()), battery, actual), curves(realtime, actual)));
+ items.add(new Item(candidate(test, battery), actual, rows, metrics(rows, actual), battery.getFields(), chargeSteps(steps.get(selection.testId()), realtime, battery, actual), curves(realtime, actual), stepCurves(realtime, actual)));
}
return new Matrix(items, items.stream().flatMap(item -> item.cycleNos().stream()).distinct().sorted().toList());
}
@@ -106,8 +108,10 @@
{
Settings settings = new Settings(validateFields(request.settings().fields(), true), request.settings().values(),
request.settings().chargeStepSelections() == null ? Map.of() : request.settings().chargeStepSelections(),
- request.settings().metrics(), request.settings().seriesColors(), request.settings().sourceDetailOverrides());
+ request.settings().metrics(), request.settings().seriesColors(), request.settings().manualChargeSteps(),
+ request.settings().curveStepSelections(), request.settings().hiddenSeriesKeys(), request.settings().activeCycle());
Matrix matrix = freeze(preview(request.selections()), settings.fields());
+ settings = stepSettings(settings, matrix.items(), false);
validateValues(settings, matrix.items()); validateChargeSelections(settings, matrix.items());
var snapshot = new LinkedHashMap<String, Object>();
snapshot.put("name", request.name().trim()); snapshot.put("description", request.description());
@@ -135,8 +139,8 @@
public Map<String, Object> edit(long id, FormationReportRequest.Edit request, long userId, String userName)
{
var snapshot = current(id, request.baseVersionNo());
- Settings settings = new Settings(validateFields(request.settings().fields(), false), request.settings().values(),
- request.settings().chargeStepSelections(), request.settings().metrics(), request.settings().seriesColors(), request.settings().sourceDetailOverrides());
+ validateFields(request.settings().fields(), false);
+ var settings = "actual-steps".equals(snapshot.getString("curveMode")) ? stepSettings(request.settings(), items(snapshot), false) : request.settings();
validateValues(settings, items(snapshot)); validateChargeSelections(settings, items(snapshot));
snapshot.put("name", request.name().trim()); snapshot.put("description", request.description()); snapshot.put("settings", settings);
reports.append(id, request.baseVersionNo() + 1, request.name().trim(), json(snapshot), userId, userName, request.changeSummary().trim());
@@ -153,8 +157,8 @@
Set<String> allowed = valueKeys(settings.fields(), matrix.items());
Map<String, String> values = new LinkedHashMap<>();
settings.values().forEach((key, value) -> { if (allowed.contains(key)) values.put(key, value); });
- snapshot.put("items", matrix.items()); snapshot.put("cycleNos", matrix.cycleNos()); snapshot.put("settings", new Settings(validateFields(settings.fields(), false), values,
- settings.chargeStepSelections() == null ? Map.of() : settings.chargeStepSelections(), settings.metrics(), settings.seriesColors(), settings.sourceDetailOverrides()));
+ snapshot.put("items", matrix.items()); snapshot.put("cycleNos", matrix.cycleNos()); snapshot.put("settings", new Settings(settings.fields(), values,
+ settings.chargeStepSelections() == null ? Map.of() : settings.chargeStepSelections(), settings.metrics(), settings.seriesColors(), settings.manualChargeSteps(), settings.curveStepSelections(), settings.hiddenSeriesKeys(), settings.activeCycle()));
curveUnits(snapshot);
reports.append(id, request.baseVersionNo() + 1, snapshot.getString("name"), json(snapshot), userId, userName, "按最新来源生成：" + request.changeSummary().trim());
return get(id, null);
@@ -172,13 +176,7 @@
var current = resolveDefinitions ? definitions.selectBatteryGroupFieldList(new TBatteryGroupField()) : List.<TBatteryGroupField>of();
return fields.stream().map(field -> {
if (!names.add(field.scope() + "|" + field.key())) throw new ServiceException("化成字段不能重复");
- if (!"battery".equals(field.kind())) {
- // 仅新生成的字段结构纠正旧误写，读取历史快照时不改名。
- String corrected = Map.of("chargePerGram", "每克N充电量", "chargePerGramTotal", "每克F充电量",
- "capacity1v", "1.0V容量", "capacity1vf", "1.0VF克容量", "dischargeInflection", "拐点容量",
- "dischargeInflectionTotal", "拐点F克容量").get(field.key());
- return corrected == null ? field : new FormationField(field.key(), field.scope(), field.kind(), corrected, field.unit(), field.fieldDefinitionId());
- }
+ if (!"battery".equals(field.kind())) return field;
Long id = field.fieldDefinitionId();
if (resolveDefinitions)
{
@@ -215,7 +213,7 @@
}).toList();
return new Item(item.source(), item.cycleNos(), rows, metrics(rows, item.cycleNos()), item.businessFields().stream()
.filter(value -> fields.stream().anyMatch(field -> "battery".equals(field.kind()) && (field.fieldDefinitionId() == null
- ? field.key().equals(value.getFieldName()) : field.fieldDefinitionId().equals(value.getFieldDefinitionId())))).toList(), item.chargeSteps(), item.curves());
+ ? field.key().equals(value.getFieldName()) : field.fieldDefinitionId().equals(value.getFieldDefinitionId())))).toList(), item.chargeSteps(), item.curves(), item.stepCurves());
}).toList();
return new Matrix(frozen, matrix.cycleNos());
}
@@ -224,16 +222,9 @@
{
if (settings.metrics().stream().anyMatch(value -> value == null || !Set.of("voltage", "current", "positiveVoltage", "negativeVoltage", "temperature").contains(value))
|| new HashSet<>(settings.metrics()).size() != settings.metrics().size()) throw new ServiceException("化成曲线指标无效或重复");
- Set<String> sources = new HashSet<>(items.stream().map(item -> item.source().selection().testId() + "|" + item.source().selection().testBatteryId()).toList());
- if (settings.sourceDetailOverrides() != null) {
- if (!sources.containsAll(settings.sourceDetailOverrides().keySet())) throw new ServiceException("详情调整不属于所选测试电池");
- for (var override : settings.sourceDetailOverrides().values()) {
- if (override == null || (override.experimentName() != null && override.experimentName().length() > 500)) throw new ServiceException("详情调整无效");
- if (override.fieldValues() != null && override.fieldValues().entrySet().stream().anyMatch(entry ->
- entry.getKey() == null || !entry.getKey().matches("(?:battery|special)\\|.{1,100}")
- || entry.getValue() == null || entry.getValue().length() > 500)) throw new ServiceException("详情字段名称或值无效");
- }
- }
+ Set<String> sources = new HashSet<>(items.stream().map(item -> sourceKey(item)).toList());
+ for (Item item : items) if (item.stepCurves() != null) item.stepCurves().forEach((cycle, ranges) -> ranges.keySet().forEach(step -> sources.add(sourceKey(item) + "|" + cycle + "|" + step)));
+ if (settings.hiddenSeriesKeys() != null && !sources.containsAll(settings.hiddenSeriesKeys())) throw new ServiceException("隐藏曲线不属于当前来源工步");
if (!sources.containsAll(settings.seriesColors().keySet()) || settings.seriesColors().values().stream()
.anyMatch(color -> color == null || !color.matches("#[0-9a-fA-F]{6}"))) throw new ServiceException("化成曲线颜色或来源无效");
if (settings.values() == null || !valueKeys(settings.fields(), items).containsAll(settings.values().keySet())
@@ -266,8 +257,66 @@
return result;
}
+ private String sourceKey(Item item) { return item.source().selection().testId() + "|" + item.source().selection().testBatteryId(); }
+
+ private Map<Integer, Map<Integer, Curve>> stepCurves(List<Map<String, Object>> rows, List<Integer> cycles)
+ {
+ Map<Integer, Map<Integer, Curve>> result = new LinkedHashMap<>();
+ for (int cycle : cycles) {
+ Map<Integer, Curve> ranges = new LinkedHashMap<>();
+ rows.stream().filter(row -> cycleNo(row) == cycle).map(row -> number(row.get("stepNo"))).filter(no -> no > 0).distinct().sorted().forEach(step -> {
+ var selected = rows.stream().filter(row -> cycleNo(row) == cycle && number(row.get("stepNo")) == step).toList();
+ // 每实际工步按最早柜/采集器时间归零，显隐及选组均不改变冻结点。
+ ranges.put(step, curves(selected, List.of(cycle)).get(cycle));
+ });
+ result.put(cycle, ranges);
+ }
+ return result;
+ }
+
+ private Settings stepSettings(Settings settings, List<Item> items, boolean refresh)
+ {
+ Map<String, List<Integer>> manual = new LinkedHashMap<>();
+ Map<String, FormationReportRequest.StepSelection> selected = new LinkedHashMap<>();
+ Set<String> allowed = new HashSet<>();
+ for (Item item : items) for (int cycle : item.cycleNos()) {
+ String key = sourceKey(item) + "|" + cycle;
+ allowed.add(key);
+ var steps = item.chargeSteps().getOrDefault(cycle, List.of());
+ var unknown = steps.stream().filter(step -> step.direction() == Direction.UNKNOWN).map(ChargeStep::stepNo).toList();
+ var requested = settings.manualChargeSteps() == null ? List.<Integer>of() : settings.manualChargeSteps().getOrDefault(key, List.of());
+ if (refresh) requested = requested.stream().filter(unknown::contains).toList();
+ if (requested == null || !unknown.containsAll(requested) || new HashSet<>(requested).size() != requested.size()) throw new ServiceException("人工充电工步不属于当前测试电池、循环或未知类型");
+ manual.put(key, requested);
+ var charge = steps.stream().filter(step -> step.direction() == Direction.CHARGE).map(ChargeStep::stepNo).toList();
+ var discharge = steps.stream().filter(step -> step.direction() == Direction.DISCHARGE).map(ChargeStep::stepNo).toList();
+ var chargeAllowed = new HashSet<>(charge); chargeAllowed.addAll(unknown);
+ var dischargeAllowed = new HashSet<>(discharge); dischargeAllowed.addAll(unknown);
+ var choice = settings.curveStepSelections() == null ? null : settings.curveStepSelections().get(key);
+ if (choice == null) choice = new FormationReportRequest.StepSelection(charge.isEmpty() ? requested : charge, discharge);
+ if (refresh) choice = new FormationReportRequest.StepSelection(choice.charge().stream().filter(chargeAllowed::contains).toList(), choice.discharge().stream().filter(dischargeAllowed::contains).toList());
+ if (choice.charge() == null || choice.discharge() == null || !chargeAllowed.containsAll(choice.charge()) || !dischargeAllowed.containsAll(choice.discharge())
+ || new HashSet<>(choice.charge()).size() != choice.charge().size() || new HashSet<>(choice.discharge()).size() != choice.discharge().size()) throw new ServiceException("曲线工步不属于当前测试电池、循环或充放电分组");
+ if (choice.charge().stream().anyMatch(choice.discharge()::contains)) throw new ServiceException("同一实际工步不能同时指定为充电和放电");
+ selected.put(key, choice);
+ }
+ if (!refresh && ((settings.manualChargeSteps() != null && !allowed.containsAll(settings.manualChargeSteps().keySet()))
+ || (settings.curveStepSelections() != null && !allowed.containsAll(settings.curveStepSelections().keySet())))) throw new ServiceException("工步选择不属于所选测试电池和循环");
+ var cycles = items.stream().flatMap(item -> item.cycleNos().stream()).distinct().sorted().toList();
+ Integer active = settings.activeCycle();
+ if (active != null && !cycles.contains(active) && !refresh) throw new ServiceException("曲线循环不属于当前报表");
+ if (active == null || !cycles.contains(active)) active = cycles.isEmpty() ? null : cycles.get(0);
+ Set<String> series = new HashSet<>();
+ for (Item item : items) { series.add(sourceKey(item)); item.stepCurves().forEach((cycle, ranges) -> ranges.keySet().forEach(step -> series.add(sourceKey(item) + "|" + cycle + "|" + step))); }
+ var colors = new LinkedHashMap<>(settings.seriesColors());
+ var hidden = settings.hiddenSeriesKeys() == null ? List.<String>of() : settings.hiddenSeriesKeys();
+ if (refresh) { colors.keySet().retainAll(series); hidden = hidden.stream().filter(series::contains).toList(); }
+ return new Settings(settings.fields(), settings.values(), settings.chargeStepSelections(), settings.metrics(), colors, manual, selected, hidden, active);
+ }
+
private void validateChargeSelections(Settings settings, List<Item> items)
{
+ if (items.stream().allMatch(item -> item.stepCurves() != null)) return;
Map<String, Integer> selections = settings.chargeStepSelections() == null ? Map.of() : settings.chargeStepSelections();
for (Item item : items) for (int cycle : item.cycleNos()) {
String key = item.source().selection().testId() + "|" + item.source().selection().testBatteryId() + "|" + cycle;
@@ -284,18 +333,25 @@
}
}
- private Map<Integer, List<ChargeStep>> chargeSteps(List<Map<String, Object>> rows, TTestBattery battery, List<Integer> cycles)
+ private Map<Integer, List<ChargeStep>> chargeSteps(List<Map<String, Object>> rows, List<Map<String, Object>> realtime, TTestBattery battery, List<Integer> cycles)
{
Map<Integer, List<ChargeStep>> result = new LinkedHashMap<>();
- for (int cycle : cycles) result.put(cycle, rows == null ? List.of() : rows.stream()
- .filter(row -> Objects.equals(battery.getBatteryNo(), row.get("batteryNo")) && cycleNo(row) == cycle)
- .map(row -> new ChargeStep(number(row.get("stepNo")), String.valueOf(row.getOrDefault("stepName", "")),
- String.valueOf(row.getOrDefault("stepType", "")), decimal(row.get("endVoltage"))))
- // 无法可靠识别类型时保留该循环的全部实际工步，由操作员选择，不凭名称或电流猜测。
- .filter(step -> step.stepNo() > 0).toList());
+ for (int cycle : cycles) {
+ Map<Integer, ChargeStep> found = new java.util.TreeMap<>();
+ // 实时记录只补充实际范围身份，不代替缺失的工步终止电压。
+ for (var row : realtime) if (cycleNo(row) == cycle && number(row.get("stepNo")) > 0) {
+ String type = String.valueOf(row.getOrDefault("stepType", ""));
+ found.putIfAbsent(number(row.get("stepNo")), new ChargeStep(number(row.get("stepNo")), String.valueOf(row.getOrDefault("stepName", "")), type, null, directions.resolve(type)));
+ }
+ if (rows != null) for (var row : rows) if (Objects.equals(battery.getBatteryNo(), row.get("batteryNo")) && cycleNo(row) == cycle && number(row.get("stepNo")) > 0) {
+ String type = String.valueOf(row.getOrDefault("stepType", ""));
+ found.put(number(row.get("stepNo")), new ChargeStep(number(row.get("stepNo")), String.valueOf(row.getOrDefault("stepName", "")), type, decimal(row.get("endVoltage")), directions.resolve(type)));
+ }
+ result.put(cycle, new ArrayList<>(found.values()));
+ }
return result;
}
- private boolean isReliableCharge(String type) { String value = type == null ? "" : type.trim().toLowerCase(); return value.equals("cc") || value.equals("charge") || value.equals("charging"); }
+ private boolean isReliableCharge(String type) { return directions.resolve(type) == Direction.CHARGE; }
private int number(Object value) { return value instanceof Number n ? n.intValue() : 0; }
private BigDecimal decimal(Object value) { return value instanceof Number n ? new BigDecimal(n.toString()) : null; }
@@ -331,20 +387,7 @@
private boolean eligible(TTest test) { return "COMPLETED".equals(test.getTestStatus()) && "化成".equals(test.getTestTypeName()); }
private Candidate candidate(TTest test, TTestBattery battery)
- { return new Candidate(new Selection(test.getTestId(), battery.getTestBatteryId()), test.getTestName(), test.getTestTypeName(), battery.getGroupId(), battery.getGroupName(), battery.getBatteryNo(), consoleDetail(test, battery)); }
- private TTestConsoleDetail consoleDetail(TTest test, TTestBattery battery)
- {
- var original = test.getConsoleDetail();
- if (original == null) return null;
- var result = new TTestConsoleDetail();
- result.setExperimentName(original.getExperimentName()); result.setBatteryFields(original.getBatteryFields()); result.setSpecialFields(original.getSpecialFields());
- // 只冻结所选电池的人工详情，同名字段不推断共享身份或业务单位。
- Map<String, Map<String, String>> values = new LinkedHashMap<>();
- original.getFieldValues().forEach((field, byBattery) -> {
- if (byBattery.containsKey(battery.getBatteryNo())) values.put(field, Map.of(battery.getBatteryNo(), byBattery.get(battery.getBatteryNo())));
- });
- result.setFieldValues(values); return result;
- }
+ { return new Candidate(new Selection(test.getTestId(), battery.getTestBatteryId()), test.getTestName(), test.getTestTypeName(), battery.getGroupId(), battery.getGroupName(), battery.getBatteryNo()); }
private List<Map<String, Object>> batteryRows(List<Map<String, Object>> rows, TTestBattery battery)
{ return rows.stream().filter(row -> Objects.equals(battery.getBatteryNo(), row.get("batteryNo"))).toList(); }
private int cycleNo(Map<String, Object> row) { return row.get("cycleNo") instanceof Number number ? number.intValue() : 0; }
--
Gitblit v1.7.1