From 1c8b2be08e6c7655bab6d8a99f15b883768f0d38 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 30 七月 2024 17:15:43 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java index 2fbb8ec..57e3dd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java @@ -7,7 +7,6 @@ import com.ruoyi.common.utils.StringUtils; import com.smartor.service.impl.RemoteDataSaveServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RestController; @@ -15,14 +14,9 @@ import java.net.ServerSocket; import java.net.Socket; import java.text.SimpleDateFormat; -import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; import java.util.*; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import java.util.regex.Matcher; -import java.util.regex.Pattern; @RestController @Slf4j @@ -85,8 +79,8 @@ //鑾峰彇杩斿洖鏁版嵁 String messageControlID = list.get(9); String timeOfAnEvent = list.get(6); - String senderApp = list.get(2); - String senderFac = list.get(3); +// String senderApp = list.get(2); +// String senderFac = list.get(3); String dataType = list.get(8); if (StringUtils.isNotEmpty(dataType)) { @@ -104,10 +98,13 @@ ACK ack = new ACK(); ack.initQuickstart("ACK", "2.4", "P"); // 璁剧疆MSH娈电殑瀛楁 - ack.getMSH().getSendingApplication().getNamespaceID().setValue("HIS"); - ack.getMSH().getSendingFacility().getNamespaceID().setValue(senderFac); - ack.getMSH().getReceivingApplication().getNamespaceID().setValue(senderApp); - ack.getMSH().getReceivingFacility().getNamespaceID().setValue(senderFac); + ack.getMSH().getSendingApplication().getNamespaceID().setValue("SF"); +// ack.getMSH().getSendingFacility().getNamespaceID().setValue(senderFac); + ack.getMSH().getSendingFacility().getNamespaceID().setValue("SF"); +// ack.getMSH().getReceivingApplication().getNamespaceID().setValue(senderApp); + ack.getMSH().getReceivingApplication().getNamespaceID().setValue("QN"); +// ack.getMSH().getReceivingFacility().getNamespaceID().setValue(senderFac); + ack.getMSH().getReceivingFacility().getNamespaceID().setValue("QN"); ack.getMSH().getDateTimeOfMessage().getTimeOfAnEvent().setValue(timeOfAnEvent); ack.getMSH().getMessageType().getMessageType().setValue("ACK"); ack.getMSH().getMessageType().getTriggerEvent().setValue("ACK"); -- Gitblit v1.9.3