From 181d563d9c3993c2919ff2eb6d20f911a7dc2789 Mon Sep 17 00:00:00 2001 From: huzhengkao <562572218@qq.com> Date: Thu, 26 Jun 2025 14:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupervisionEdhServerController.java | 3 +- .../supervision/edh/enums/SubTypeEnum.java | 30 +++++-------------- .../impl/EventProcessingServiceImpl.java | 1 + 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/supervision/edh/controller/SupervisionEdhServerController.java b/src/main/java/com/supervision/edh/controller/SupervisionEdhServerController.java index 8ac53df..5c30a93 100644 --- a/src/main/java/com/supervision/edh/controller/SupervisionEdhServerController.java +++ b/src/main/java/com/supervision/edh/controller/SupervisionEdhServerController.java @@ -97,7 +97,7 @@ public class SupervisionEdhServerController { String de = certManager.keyDecrypt(privateKey, eventPojo.getData()); String data = StreamUtil.getUnStreamContent(de); - logger.info("解密之后的文件内容:{}", data); + //logger.info("解密之后的文件内容:{}", data); //保存数据日志 EdhReceiveDataLog dataLog = new EdhReceiveDataLog(); @@ -181,5 +181,4 @@ public class SupervisionEdhServerController { } - } diff --git a/src/main/java/com/supervision/edh/enums/SubTypeEnum.java b/src/main/java/com/supervision/edh/enums/SubTypeEnum.java index 617cfb8..1437211 100644 --- a/src/main/java/com/supervision/edh/enums/SubTypeEnum.java +++ b/src/main/java/com/supervision/edh/enums/SubTypeEnum.java @@ -5,29 +5,13 @@ package com.supervision.edh.enums; * @date 2025年06月04日 11:08:40 */ public enum SubTypeEnum { - SUBTYPE_1011("1011", "境内药品生产企业基本信息数据子集"), - SUBTYPE_1012("1012", "境外药品生产企业基本信息数据子集"), - SUBTYPE_1013("1013", "药品生产许可证基本信息数据子集"), - SUBTYPE_1014("1014", "药品经营企业基本信息数据子集"), - SUBTYPE_1015("1015", "药品经营许可证基本信息数据子集"), - SUBTYPE_1016("1016", "药品配送企业基本信息数据子集"), - SUBTYPE_1017("1017", "药品使用单位基本信息数据子集"), - SUBTYPE_1018("1018", "国产药品基本信息数据子集"), - SUBTYPE_1019("1019", "进口药品基本信息数据子集"), - SUBTYPE_9001("9001", "药检报告基础信息数据子集"), - SUBTYPE_9002("9002", "药检报告概览回传基础信息数据子集"), - SUBTYPE_2011("2011", "国产药品生产信息数据子集"), - SUBTYPE_2012("2012", "药品进口信息数据子集"), - SUBTYPE_2013("2013", "药品自检信息数据子集"), - SUBTYPE_2015("2015", "发货单信息数据子集"), - SUBTYPE_2016("2016", "收货单信息数据子集"), - SUBTYPE_2017("2017", "药品零售与药品使用信息数据子集"), - SUBTYPE_2018("2018", "药品召回信息数据子集"), - SUBTYPE_2019("2019", "库存上报基本信息数据子集"), - SUBTYPE_2020("2020", "撤销单"), - SUBTYPE_2051("2051", "温度信息子集-单据与存储设备关系信息"), - SUBTYPE_2052("2052", "温度信息子集-存储设备温度信息"), - SUBTYPE_2053("2053", "温度信息子集-运输温度信息"); + SUBTYPE_1011("1011", "药品经营企业基本信息数据集"), + SUBTYPE_1012("1012", "药品经营许可证基本信息数据集"), + SUBTYPE_1013("1013", "药品基本信息数据集"), + SUBTYPE_2011("2011", "发货单信息数据集"), + SUBTYPE_2012("2012", "收货单信息数据集"), + SUBTYPE_2013("2013", "库存上报信息数据集"), + SUBTYPE_2015("2014", "仓库存储温湿度信息数据集"); private final String type; diff --git a/src/main/java/com/supervision/edh/service/impl/EventProcessingServiceImpl.java b/src/main/java/com/supervision/edh/service/impl/EventProcessingServiceImpl.java index f3c8f5a..9d0358b 100644 --- a/src/main/java/com/supervision/edh/service/impl/EventProcessingServiceImpl.java +++ b/src/main/java/com/supervision/edh/service/impl/EventProcessingServiceImpl.java @@ -38,6 +38,7 @@ public class EventProcessingServiceImpl{ // 业务逻辑... EventDataHandler handler = handlerFactory.getHandler(eventPojo.getSubType()); handler.handleData(data,eventId); + future.complete(null); // 显式标记完成 } catch (Exception e) { future.completeExceptionally(e); // 传递异常 }