Merge branch 'dev-czy'
# Conflicts: # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/IcdToXmlResponseConverter.java # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/JsonToXmlConversionService.java # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/component/RuleBasedXmlMappingService.java # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/pojo/bo/IcdToXmlGenerateResult.java # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/pojo/vo/IcdToXmlResponse.java # tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/service/impl/IcdToXmlTaskAppService.java
This commit is contained in:
@@ -93,7 +93,7 @@ public class JsonToXmlConversionService {
|
||||
MappingDocument mappingDocument = objectMapper.readValue(mappingJson, MappingDocument.class);
|
||||
return buildXmlFromMapping(mappingDocument, templateStream, ruleStreams, indexMapping, methodDescribeList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 从MappingDocument构建XML内容
|
||||
*/
|
||||
@@ -986,7 +986,7 @@ public class JsonToXmlConversionService {
|
||||
}
|
||||
methodDescribeList.add(message);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 指标信息内部类
|
||||
*/
|
||||
|
||||
@@ -26,4 +26,12 @@ public class MappingModuleConfig {
|
||||
/** 默认输出目录。 */
|
||||
@Value("${icd.mapping.default-output-dir:}")
|
||||
private String defaultOutputDir;
|
||||
|
||||
/** JSON转XML使用的默认XML模板路径。 */
|
||||
@Value("${icd.mapping.json-to-xml-template-path:template/JiangSu_Config2.xml}")
|
||||
private String jsonToXmlTemplatePath;
|
||||
|
||||
/** JSON转XML使用的默认规则文件路径。 */
|
||||
@Value("${icd.mapping.json-to-xml-rule-path:template/默认规则.txt}")
|
||||
private String jsonToXmlRulePath;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user