diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/AbstractEventDataHandler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/AbstractEventDataHandler.java index c2f2b7f..915f029 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/AbstractEventDataHandler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/AbstractEventDataHandler.java @@ -23,10 +23,10 @@ public abstract class AbstractEventDataHandler implements EventDataHandler { protected abstract IService getService(); - protected abstract T convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail detail); + protected abstract T convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail detail,String eventId); @Override - public void handle(VTTSEventS eventS) { + public void handle(VTTSEventS eventS,String eventId) { List entities = new ArrayList<>(); for (EventBody eventBody : eventS.getVttsEvent().getEventBodyList()) { @@ -35,14 +35,14 @@ public abstract class AbstractEventDataHandler implements EventDataHandler { if (item.getInstanceList() != null) { for (InstanceDetail instance : item.getInstanceList()) { try { - entities.add(convertToEntity(eventBody, item, instance)); + entities.add(convertToEntity(eventBody, item, instance,eventId)); } catch (Exception e) { log.error("转换实体失败", e); } } } else { try { - entities.add(convertToEntity(eventBody, item, null)); + entities.add(convertToEntity(eventBody, item, null,eventId)); } catch (Exception e) { log.error("转换实体失败", e); } @@ -51,7 +51,7 @@ public abstract class AbstractEventDataHandler implements EventDataHandler { } } else { try { - entities.add(convertToEntity(eventBody, null, null)); + entities.add(convertToEntity(eventBody, null, null,eventId)); } catch (Exception e) { log.error("转换实体失败", e); } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/EventDataHandler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/EventDataHandler.java index 733ca5e..28fa821 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/EventDataHandler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/EventDataHandler.java @@ -9,7 +9,7 @@ public interface EventDataHandler { String getSubType(); // 返回业务subType //处理应用数据 - void handle(VTTSEventS eventS); + void handle(VTTSEventS eventS,String eventId); //处理基础数据 void handleBase(String xml,String eventId); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java index 9a7461e..5898007 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java @@ -38,7 +38,7 @@ public class SubType2011Handler extends AbstractEventDataHandler