Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -83,7 +83,7 @@ public class RuleBasedXmlMappingService {
|
||||
|
||||
public List<InputStream> loadDefaultRuleFile( ) throws Exception {
|
||||
|
||||
ClassPathResource ruleResource = new ClassPathResource("template/默认规则.txt");
|
||||
ClassPathResource ruleResource = new ClassPathResource("template/DefaultRule.txt");
|
||||
if ( !ruleResource.exists()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -32,6 +32,6 @@ public class MappingModuleConfig {
|
||||
private String jsonToXmlTemplatePath;
|
||||
|
||||
/** JSON转XML使用的默认规则文件路径。 */
|
||||
@Value("${icd.mapping.json-to-xml-rule-path:template/默认规则.txt}")
|
||||
@Value("${icd.mapping.json-to-xml-rule-path:template/DefaultRule.txt}")
|
||||
private String jsonToXmlRulePath;
|
||||
}
|
||||
|
||||
@@ -244,8 +244,8 @@
|
||||
<Value name="IZSEQ" desc="零序电流平均值" type="6" DO="" DA="" />
|
||||
<Value name="MAX_IZSEQ" desc="零序电流最大值" type="6" DO="" DA="" />
|
||||
<Value name="MIN_IZSEQ" desc="零序电流最小值" type="6" DO="" DA="" />
|
||||
<Value name="G_VZSEQ_UNBAN" desc="零序电流不平衡95值" type="6" DO="" DA="" />
|
||||
<Value name="VZSEQ_UNBAN" desc="零序电流不平衡平均值" type="6" DO="" DA="" />
|
||||
<Value name="G_IZSEQ_UNBAN" desc="零序电流不平衡95值" type="6" DO="" DA="" />
|
||||
<Value name="IZSEQ_UNBAN" desc="零序电流不平衡平均值" type="6" DO="" DA="" />
|
||||
<Value name="MAX_IZSEQ_UNBAN" desc="零序电流不平衡最大值" type="6" DO="" DA="" />
|
||||
<Value name="MIN_IZSEQ_UNBAN" desc="零序电流不平衡最小值" type="6" DO="" DA="" />
|
||||
<Value name="G_IPSEQ" desc="正序电流95值" type="6" DO="" DA="" />
|
||||
|
||||
Reference in New Issue
Block a user