huzhengkao
/
provtest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码调整

This commit is contained in:
daichao 2025-06-21 10:45:54 +08:00
parent f27000a5a6
commit 32c6b1e222
15 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/alihealth/d2d/provtest/service/handle/AbstractEventDataHandler.java
View File

@ -23,10 +23,10 @@ public abstract class AbstractEventDataHandler<T> implements EventDataHandler {
protected abstract IService<T> 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<T> entities = new ArrayList<>();
for (EventBody eventBody : eventS.getVttsEvent().getEventBodyList()) {
@ -35,14 +35,14 @@ public abstract class AbstractEventDataHandler<T> 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<T> implements EventDataHandler {
}
} else {
try {
entities.add(convertToEntity(eventBody, null, null));
entities.add(convertToEntity(eventBody, null, null,eventId));
} catch (Exception e) {
log.error("转换实体失败", e);
}

2
src/main/java/com/alihealth/d2d/provtest/service/handle/EventDataHandler.java
View File

@ -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);

6
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
View File

@ -38,7 +38,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
}
@Override
protected DomesticDrugProductionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DomesticDrugProductionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance, String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -47,10 +47,10 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
try {
return DomesticDrugProductionApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.rkdbh(evtBasic.getString("RKDBH"))
.rkdbh(evtBasic.getString("RKDBH"))
.rksj(formatterDatetime.parse(evtBasic.getString("RKSJ")))
.rkdwmc(evtBasic.getString("RKDWMC"))

5
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java
View File

@ -37,7 +37,7 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
}
@Override
protected DrugImportApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugImportApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -45,7 +45,8 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
try {
return DrugImportApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.rksj(evtBasic.getString("RKSJ") != null ? formatterDatetime.parse(evtBasic.getString("RKSJ")) : null)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java
View File

@ -37,7 +37,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
}
@Override
protected DrugSelfInspectionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugSelfInspectionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -45,7 +45,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
try {
return DrugSelfInspectionApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ypjybgsbh(evtBasic.getString("YPJYBGSBH"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
View File

@ -37,7 +37,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
}
@Override
protected DrugInvoiceApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugInvoiceApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//日期格式
@ -45,7 +45,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
try {
return
DrugInvoiceApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ypzsm(instance.getString("YPZSM"))

5
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java
View File

@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -34,7 +33,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
}
@Override
protected DrugDeliveryNoteApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugDeliveryNoteApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -43,7 +42,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
try {
return DrugDeliveryNoteApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ypzsm(instance.getString("YPZSM"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2017Handler extends AbstractEventDataHandler<DrugRetailAndUs
}
@Override
protected DrugRetailAndUseApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugRetailAndUseApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2017Handler extends AbstractEventDataHandler<DrugRetailAndUs
try {
return DrugRetailAndUseApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ypzsm(instance.getString("YPZSM"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2018Handler extends AbstractEventDataHandler<DrugRecallApply
}
@Override
protected DrugRecallApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected DrugRecallApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2018Handler extends AbstractEventDataHandler<DrugRecallApply
try {
return DrugRecallApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ypzsm(instance.getString("YPZSM"))

5
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java
View File

@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -34,7 +33,7 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
}
@Override
protected WarehouseStockApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected WarehouseStockApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -43,7 +42,7 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
try {
return WarehouseStockApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.yptymc(item.getString("YPTYMC"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2020Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2020Handler extends AbstractEventDataHandler<RevocationOrder
}
@Override
protected RevocationOrderApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected RevocationOrderApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2020Handler extends AbstractEventDataHandler<RevocationOrder
try {
return RevocationOrderApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.ysddjh(evtBasic.getString("YSDDJH"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2051Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2051Handler extends AbstractEventDataHandler<ReceiptAndStora
}
@Override
protected ReceiptAndStorageDeviceRelTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected ReceiptAndStorageDeviceRelTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2051Handler extends AbstractEventDataHandler<ReceiptAndStora
try {
return ReceiptAndStorageDeviceRelTemperatureApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.tyshxydm(evtBasic.getString("TYSHXYDM"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2052Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2052Handler extends AbstractEventDataHandler<StorageDeviceTe
}
@Override
protected StorageDeviceTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected StorageDeviceTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2052Handler extends AbstractEventDataHandler<StorageDeviceTe
try {
return StorageDeviceTemperatureApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.tyshxydm(evtBasic.getString("TYSHXYDM"))

4
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2053Handler.java
View File

@ -33,7 +33,7 @@ public class SubType2053Handler extends AbstractEventDataHandler<TransportTemper
}
@Override
protected TransportTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
protected TransportTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
EventBasic evtBasic = eventBody.getEvtBasic();
//时间格式
SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -42,7 +42,7 @@ public class SubType2053Handler extends AbstractEventDataHandler<TransportTemper
try {
return TransportTemperatureApplyInfo.builder()
.eventId(eventBody.getEventID())
.eventId(eventId)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.tyshxydm(evtBasic.getString("TYSHXYDM"))

3
src/main/java/com/alihealth/d2d/provtest/service/impl/EventProcessingServiceImpl.java
View File

@ -35,7 +35,8 @@ public class EventProcessingServiceImpl {
} catch (Exception e) {
throw new RuntimeException(e);
}
handler.handle(eventS);
//TODO 需要加上外层的eventId ，与日志表进行关联
handler.handle(eventS,eventId);
}else{
handler.handleBase(xml,eventId);
}