ClientApps/CN_Tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整了ICDCOUNT计数的逻辑，去除了重复性FCDA计数判断

Browse Source
This commit is contained in:
张文
2026-05-08 11:40:00 +08:00
parent 34b1a81c70
commit 2c1d926261
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/infrastructure/parser/SclGeneratedModelReader.java
View File

@@ -96,7 +96,7 @@ public class SclGeneratedModelReader {
* 从 LN0 或 LN 中读取 DataSet 与 ReportControl 信息。 * 从 LN0 或 LN 中读取 DataSet 与 ReportControl 信息。
*/ */
private void readReportAndDataSetFromAnyLn(TAnyLN anyLn, IcdDocument document) { private void readReportAndDataSetFromAnyLn(TAnyLN anyLn, IcdDocument document) {
List<FcdaNode> allFcdas = new ArrayList<FcdaNode>(); //List<FcdaNode> allFcdas = new ArrayList<FcdaNode>();
if (anyLn.getDataSet() != null) { if (anyLn.getDataSet() != null) {
for (TDataSet dataSet : anyLn.getDataSet()) { for (TDataSet dataSet : anyLn.getDataSet()) {
DataSetNode dataSetNode = new DataSetNode(); DataSetNode dataSetNode = new DataSetNode();
@@ -105,7 +105,7 @@ public class SclGeneratedModelReader {
for (TFCDA fcda : dataSet.getFCDA()) { for (TFCDA fcda : dataSet.getFCDA()) {
FcdaNode node = toFcdaNode(fcda); FcdaNode node = toFcdaNode(fcda);
dataSetNode.getFcdas().add(node); dataSetNode.getFcdas().add(node);
allFcdas.add(node); //allFcdas.add(node);
} }
} }
document.getDataSets().put(dataSetNode.getName(), dataSetNode); document.getDataSets().put(dataSetNode.getName(), dataSetNode);
@@ -113,7 +113,7 @@ public class SclGeneratedModelReader {
} }
for (DataSetNode dataSet : document.getDataSets().values()) { for (DataSetNode dataSet : document.getDataSets().values()) {
for (FcdaNode fcda : dataSet.getFcdas()) { for (FcdaNode fcda : dataSet.getFcdas()) {
fcda.setSequenceCount(SclTraversalSupport.calculateSequenceCount(allFcdas, fcda)); fcda.setSequenceCount(SclTraversalSupport.calculateSequenceCount(dataSet.getFcdas(), fcda));
} }
} }