From aad79e7ca6eecde50b73e8930bb39d81127d20e5 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 8 Jun 2023 15:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/webservice/WebserviceMessageType.java | 16 ++++++++++++++++ .../HIP1008InspectionReportAdditionHandler.java | 3 ++- .../HIP1009InspectionReportUpdatesHandler.java | 3 ++- .../HIP1010LaboratoryReportAdditionHandler.java | 3 ++- .../HIP1011LaboratoryReportUpdatesHandler.java | 3 ++- .../webservice/impl/HIP1166PdfUploadHandler.java | 3 ++- .../webservice/impl/JsIcuReportHandler.java | 3 ++- ...ndler.java => JsLaboratoryReportHandler.java} | 5 +++-- .../webservice/impl/JsSAReportHandler.java | 3 ++- .../webservice/impl/SdryReportServerImpl.java | 13 +++++++------ 10 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/docus/server/report/webservice/WebserviceMessageType.java rename src/main/java/com/docus/server/report/webservice/impl/{JsExaminationReportHandler.java => JsLaboratoryReportHandler.java} (88%) diff --git a/src/main/java/com/docus/server/report/webservice/WebserviceMessageType.java b/src/main/java/com/docus/server/report/webservice/WebserviceMessageType.java new file mode 100644 index 0000000..c9e48ec --- /dev/null +++ b/src/main/java/com/docus/server/report/webservice/WebserviceMessageType.java @@ -0,0 +1,16 @@ +package com.docus.server.report.webservice; + +/** + * 处理webservice的类型 + * @author jiashi + */ +public interface WebserviceMessageType { + String HIP1008="HIP1008"; + String HIP1009="HIP1009"; + String HIP1010="HIP1010"; + String HIP1011="HIP1011"; + String HIP1166="HIP1166"; + String ICU="ICU"; + String SA="SA"; + String LABORATORY="LABORATORY"; +} diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java index 8660050..c72eae2 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1008InspectionReportAdditionHandler.java @@ -9,6 +9,7 @@ import com.docus.server.report.config.ZdAssortConfig; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.IdUtil; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,7 +22,7 @@ import java.util.Date; * HIP1008-检查报告新增服务处理 * @author jiahsi */ -@Service("HIP1008") +@Service(WebserviceMessageType.HIP1008) @Slf4j public class HIP1008InspectionReportAdditionHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java index 534525a..5b10337 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1009InspectionReportUpdatesHandler.java @@ -8,6 +8,7 @@ import com.docus.server.report.config.ZdAssortConfig; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.IdUtil; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,7 +21,7 @@ import java.util.Date; * HIP1009-检查报告更新服务 * @author jiahsi */ -@Service("HIP1009") +@Service(WebserviceMessageType.HIP1009) @Slf4j public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java index f1ef0c9..092df02 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1010LaboratoryReportAdditionHandler.java @@ -1,6 +1,7 @@ package com.docus.server.report.webservice.impl; import com.docus.server.report.service.ReportService; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,7 +12,7 @@ import javax.annotation.Resource; * HIP1010-检验报告新增服务 * @author jiahsi */ -@Service("HIP1010") +@Service(WebserviceMessageType.HIP1010) @Slf4j public class HIP1010LaboratoryReportAdditionHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java index 6a62d15..a48e920 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1011LaboratoryReportUpdatesHandler.java @@ -1,6 +1,7 @@ package com.docus.server.report.webservice.impl; import com.docus.server.report.service.ReportService; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,7 +12,7 @@ import javax.annotation.Resource; * HIP1009-检查报告更新服务 * @author jiahsi */ -@Service("HIP1011") +@Service(WebserviceMessageType.HIP1011) @Slf4j public class HIP1011LaboratoryReportUpdatesHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/HIP1166PdfUploadHandler.java b/src/main/java/com/docus/server/report/webservice/impl/HIP1166PdfUploadHandler.java index 2dbc070..d8ad6b5 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/HIP1166PdfUploadHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/HIP1166PdfUploadHandler.java @@ -7,6 +7,7 @@ import com.docus.server.report.api.dto.ReportDto; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.IdUtil; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,7 +21,7 @@ import java.util.Date; * * @author wyb */ -@Service("HIP1166") +@Service(WebserviceMessageType.HIP1166) @Slf4j public class HIP1166PdfUploadHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/JsIcuReportHandler.java b/src/main/java/com/docus/server/report/webservice/impl/JsIcuReportHandler.java index 9ecbcf9..5a85f09 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/JsIcuReportHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/JsIcuReportHandler.java @@ -5,6 +5,7 @@ import com.docus.server.report.api.dto.ReportDto; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.JSXMLResult; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,7 +18,7 @@ import javax.annotation.Resource; * * @author wyb */ -@Service("icu") +@Service(WebserviceMessageType.ICU) @Slf4j public class JsIcuReportHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/JsExaminationReportHandler.java b/src/main/java/com/docus/server/report/webservice/impl/JsLaboratoryReportHandler.java similarity index 88% rename from src/main/java/com/docus/server/report/webservice/impl/JsExaminationReportHandler.java rename to src/main/java/com/docus/server/report/webservice/impl/JsLaboratoryReportHandler.java index d686982..4258061 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/JsExaminationReportHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/JsLaboratoryReportHandler.java @@ -5,6 +5,7 @@ import com.docus.server.report.api.dto.ReportDto; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.JSXMLResult; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,9 +18,9 @@ import javax.annotation.Resource; * * @author wyb */ -@Service("examination") +@Service(WebserviceMessageType.LABORATORY) @Slf4j -public class JsExaminationReportHandler implements WebserviceReceiveServerHandler { +public class JsLaboratoryReportHandler implements WebserviceReceiveServerHandler { @Resource private ReportService reportService; diff --git a/src/main/java/com/docus/server/report/webservice/impl/JsSAReportHandler.java b/src/main/java/com/docus/server/report/webservice/impl/JsSAReportHandler.java index 3d237de..54c68e4 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/JsSAReportHandler.java +++ b/src/main/java/com/docus/server/report/webservice/impl/JsSAReportHandler.java @@ -5,6 +5,7 @@ import com.docus.server.report.api.dto.ReportDto; import com.docus.server.report.service.ReportService; import com.docus.server.report.util.JSXMLResult; import com.docus.server.report.util.XmlUtil; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,7 +18,7 @@ import javax.annotation.Resource; * * @author wyb */ -@Service("sa") +@Service(WebserviceMessageType.SA) @Slf4j public class JsSAReportHandler implements WebserviceReceiveServerHandler { @Resource diff --git a/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java b/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java index e5d36fd..7a5803e 100644 --- a/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java +++ b/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java @@ -1,6 +1,7 @@ package com.docus.server.report.webservice.impl; import com.docus.server.report.webservice.IReportServer; +import com.docus.server.report.webservice.WebserviceMessageType; import com.docus.server.report.webservice.WebserviceReceiveServerHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -22,32 +23,32 @@ public class SdryReportServerImpl implements IReportServer { @Override public String pushSAReport(String saReportMessage) { - return webserviceReceiveServerHandler.get("sa").handle(saReportMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.SA).handle(saReportMessage); } @Override public String pushICUReport(String icuReportMessage) { - return webserviceReceiveServerHandler.get("icu").handle(icuReportMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.ICU).handle(icuReportMessage); } @Override public String pushExaminationReport(String examinationReportMessage){ - return webserviceReceiveServerHandler.get("examination").handle(examinationReportMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.LABORATORY).handle(examinationReportMessage); } @Override public String pushAddInspectionReport(String inspectionReportMessage) { - return webserviceReceiveServerHandler.get("HIP1008").handle(inspectionReportMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.HIP1008).handle(inspectionReportMessage); } @Override public String pushUpdateInspectionReport(String inspectionReportMessage) { - return webserviceReceiveServerHandler.get("HIP1009").handle(inspectionReportMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.HIP1009).handle(inspectionReportMessage); } @Override public String pdfUpload(String uploadMessage) { - return webserviceReceiveServerHandler.get("HIP1166").handle(uploadMessage); + return webserviceReceiveServerHandler.get(WebserviceMessageType.HIP1166).handle(uploadMessage); }