From 1edee2bf1279e4a786d26fda9decdcb16ef4947a 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: Fri, 12 Jun 2026 13:55:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(mms-mapping):=20=E4=BF=AE=E5=A4=8DXML?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=92=8C?= =?UTF-8?q?JSON=E6=98=A0=E5=B0=84=E6=8F=90=E5=8F=96=E9=97=AE=E9=A2=98=20-?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7=20-=20=E5=A2=9E=E5=BC=BAextractMappingJson=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=B8=AD=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E6=94=AF=E6=8C=81=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=92=8C=E5=AF=B9=E8=B1=A1=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?mappingJson=E5=AD=97=E6=AE=B5=20-=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E8=BF=94=E5=9B=9E=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84JSON=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icd/mapping/service/impl/IcdToXmlTaskAppService.java | 2 +- .../gather/icd/mapping/debug/JsonToXmlDebugRunner.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/service/impl/IcdToXmlTaskAppService.java b/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/service/impl/IcdToXmlTaskAppService.java index f2c2326..5526bba 100644 --- a/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/service/impl/IcdToXmlTaskAppService.java +++ b/tools/mms-mapping/src/main/java/com/njcn/gather/icd/mapping/service/impl/IcdToXmlTaskAppService.java @@ -180,7 +180,7 @@ public class IcdToXmlTaskAppService { * 加载 XML 模板和规则文件。 */ private XmlResourceContext loadXmlResources() throws Exception { - return loadXmlResources(1); + return loadXmlResources(2); } private XmlResourceContext loadXmlResources(Integer configType) throws Exception { diff --git a/tools/mms-mapping/src/test/java/com/njcn/gather/icd/mapping/debug/JsonToXmlDebugRunner.java b/tools/mms-mapping/src/test/java/com/njcn/gather/icd/mapping/debug/JsonToXmlDebugRunner.java index ff3f810..b929b60 100644 --- a/tools/mms-mapping/src/test/java/com/njcn/gather/icd/mapping/debug/JsonToXmlDebugRunner.java +++ b/tools/mms-mapping/src/test/java/com/njcn/gather/icd/mapping/debug/JsonToXmlDebugRunner.java @@ -127,7 +127,6 @@ public class JsonToXmlDebugRunner { */ private static String extractMappingJson(String jsonContent, ObjectMapper objectMapper) { try { - // 尝试解析为对象，看是否包含 mappingJson 字段 if (jsonContent.trim().startsWith("{")) { java.util.Map jsonMap = objectMapper.readValue( jsonContent, @@ -137,7 +136,11 @@ public class JsonToXmlDebugRunner { if (jsonMap.containsKey("mappingJson")) { Object mappingJsonObj = jsonMap.get("mappingJson"); if (mappingJsonObj != null) { - return mappingJsonObj.toString(); + if (mappingJsonObj instanceof String) { + return (String) mappingJsonObj; + } else { + return objectMapper.writeValueAsString(mappingJsonObj); + } } } }