From fa8e612f2b1422ebed251787dd4b3091aa2a76d6 Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Thu, 6 Dec 2018 17:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E5=AD=97=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gzzn/omms/msgexchangeapi/controller/KafkaController.java | 2 +- .../omms/msgexchangeapi/msghandler/flop/FlopBaseHandler.java | 2 +- .../gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java | 2 +- .../gzzn/omms/msgexchangeapi/service/IExchangeService.java | 2 +- .../omms/msgexchangeapi/service/ExchangeServiceImplTest.java | 2 +- .../java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/KafkaController.java b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/KafkaController.java index d341df28..9bea1bcc 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/KafkaController.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/KafkaController.java @@ -37,7 +37,7 @@ public class KafkaController { kafkaservice.msgSend(topicName, msg); } catch (Exception e) { try { - String jsonStr = exchangeService.xmlToJson(msg); + String jsonStr = exchangeService.xmlstrToJson(msg); kafkaservice.msgSend(topicName, jsonStr); } catch (Exception e2) { throw new RuntimeException(e2); diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FlopBaseHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FlopBaseHandler.java index 4baa3622..32025bd9 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FlopBaseHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FlopBaseHandler.java @@ -53,7 +53,7 @@ public class FlopBaseHandler implements IBaseHandler { kafkaservice.msgSend("schd", schdMsg); //send msg - String msg = exchangeService.xmlToJson( + String msg = exchangeService.xmlstrToJson( cminmsg.getCminmsgsClobMsg() ); kafkaservice.msgSend("msg", msg); diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java index c6b83579..4d369ec7 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java @@ -16,7 +16,7 @@ import com.gzzn.omms.msgexchangeapi.exception.ExchangeServiceException; public class ExchangeServiceImpl implements IExchangeService { @Override - public String xmlToJson(String xml) throws ExchangeServiceException { + public String xmlstrToJson(String xml) throws ExchangeServiceException { try { Map map; ObjectMapper xmlMapper = new XmlMapper(); diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/IExchangeService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/IExchangeService.java index 07ad666b..ea909d7e 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/IExchangeService.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/IExchangeService.java @@ -8,7 +8,7 @@ import com.gzzn.omms.msgexchangeapi.exception.ExchangeServiceException; * */ public interface IExchangeService { - public String xmlToJson(String xml) throws ExchangeServiceException; + public String xmlstrToJson(String xml) throws ExchangeServiceException; public T xmlstrToObject(String xml,Class valueType) throws ExchangeServiceException; public String objectToXmlstr(Object object) throws ExchangeServiceException; } diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java index 275549ed..affb2d74 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java @@ -51,7 +51,7 @@ public class ExchangeServiceImplTest { "\r\n" + "\r\n" + ""; - String jsonString = exchangeService.xmlToJson(xmlString); + String jsonString = exchangeService.xmlstrToJson(xmlString); System.out.println(jsonString); //assertThat(jsonPath("$.", matcher)). diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java index c8d57751..bc96a93d 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java @@ -96,7 +96,7 @@ public class ToolTest { try { for(Cminmsg x : lsCmin) { - String json = exchangeService.xmlToJson(x.getCminmsgsClobMsg()); + String json = exchangeService.xmlstrToJson(x.getCminmsgsClobMsg()); Msg msg; msg = JsonUtil.getObject(json,Msg.class); @@ -121,7 +121,7 @@ public class ToolTest { // File f = new File(path.toString()); try (FileOutputStream fop = new FileOutputStream(f)) { - String jsonString = exchangeService.xmlToJson(x.getCminmsgsClobMsg()); + String jsonString = exchangeService.xmlstrToJson(x.getCminmsgsClobMsg()); jsonString = jsonString.replace("\"noNamespaceSchemaLocation\":\"unisysaodbsis.xsd\",", ""); byte[] contentInBytes = jsonString.getBytes("UTF-8");