From fa1a285e04397577b94e9fbf46bb0fa0873bdb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=AE=87=20=E8=94=A1?= <2418394595@qq.com>
Date: Wed, 8 Jul 2026 13:43:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(config):=20=E4=BF=AE=E5=A4=8D=E6=B1=9F?=
 =?UTF-8?q?=E8=8B=8F=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E8=A7=92=E5=8F=82=E6=95=B0=E5=92=8C=E6=B3=A2=E5=BD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=87=E5=BF=97=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现了从JSON映射文档动态替换ComtradeFile时间标志功能
- 调整了URCB相关配置的参数序列以匹配正确的数据结构
---
 .../component/JsonToXmlConversionService.java | 33 ++++++++++++++++---
 .../resources/template/JiangSu_Config1.xml    |  4 +--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/JsonToXmlConversionService.java b/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/JsonToXmlConversionService.java
index e2bc874..c532c50 100644
--- a/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/JsonToXmlConversionService.java
+++ b/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/JsonToXmlConversionService.java
@@ -108,6 +108,12 @@ public class JsonToXmlConversionService {
 
         String iedName = mappingDocument.getIed();
         String ldPrefix = mappingDocument.getLd();
+        String waveTimeFlag = mappingDocument.getWaveTimeFlag();
+        if (waveTimeFlag.startsWith("U") || waveTimeFlag.startsWith("u")){
+            waveTimeFlag= waveTimeFlag.toUpperCase();
+        }else{
+            waveTimeFlag= waveTimeFlag.toLowerCase();
+        }
 
         if (iedName != null && !iedName.isEmpty()) {
             xmlContent = xmlContent.replaceAll(
@@ -123,6 +129,14 @@ public class JsonToXmlConversionService {
             );
         }
 
+        // 从 JSON 中读取 WaveTimeFlag 替换模板中的硬编码值
+        if (waveTimeFlag != null && !waveTimeFlag.isEmpty()) {
+            xmlContent = xmlContent.replaceAll(
+                "<ComtradeFile\\s+WaveTimeFlag=\"[^\"]*\"",
+                "<ComtradeFile WaveTimeFlag=\"" + escapeXml(waveTimeFlag) + "\""
+            );
+        }
+
         return xmlContent;
     }
     
@@ -246,11 +260,20 @@ public class JsonToXmlConversionService {
         }else{
             sb.append(",60");
         }
-        sb.append(",1");
-        sb.append(",0");
-        sb.append(",0");
-        sb.append(",0");
-        sb.append(",0");
+        if(rc.getName().contains("urcb")){
+            sb.append(",0");
+            sb.append(",0");
+            sb.append(",0");
+            sb.append(",1");
+            sb.append(",0");
+        }else{
+            sb.append(",1");
+            sb.append(",0");
+            sb.append(",0");
+            sb.append(",0");
+            sb.append(",0");
+        }
+
         sb.append(",yes");
         sb.append(",1");
         sb.append(",1");
diff --git a/tools/mms-mapping/src/main/resources/template/JiangSu_Config1.xml b/tools/mms-mapping/src/main/resources/template/JiangSu_Config1.xml
index eaa4444..2f5da52 100644
--- a/tools/mms-mapping/src/main/resources/template/JiangSu_Config1.xml
+++ b/tools/mms-mapping/src/main/resources/template/JiangSu_Config1.xml
@@ -8,11 +8,11 @@
 <!--注：角型接线时，相角为0，不再进行DO、DA路径值扩展-->
 <JSConfigTemplate version="2021-12-15" author="ww" SelectStat="JiangSu" SelectReal="Kafka Producer" desc="昆明长水机场增加谐波类数据配置">
 	<!--注：暂态事件解析规则配置 Flag：0-不分相 1-分相 如果Flag=0 A，B，C配置成一样，如果Flag=1，A，B，C根据实际配置-->
-	<WavePhasic Flag="1" A="QVVR1" B="QVVR2" C="QVVR3" />
+	<WavePhasic Flag="1" A="QVVR0" B="QVVR1" C="QVVR2" />
 	<!--注：暂态事件持续事件单位：0-毫秒 1-秒-->
 	<UnitOfTime Unit="0" />
 	<!--注：上送值的时间：UTC-UTC时间 beijing-北京时间-->
-	<ValueOfTime Unit="utc" />
+	<ValueOfTime Unit="UTC" />
 	<!--注：录波文件的时间：UTC-UTC时间 beijing-北京时间-->
 	<ComtradeFile WaveTimeFlag="beijing" />
 	<IED name="PQMonitor" desc="电能质量监测装置"  />