From c8331d20c628f75a16470ea94db650f65da9fdf6 Mon Sep 17 00:00:00 2001 From: chuanxingchao Date: Tue, 10 Jun 2025 17:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=B7=BB=E5=8A=A02012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../controller/ProvTestServerController.java | 3 +- .../domain/DrugDeliveryNoteApplyInfo.java | 185 ++++++++++------ .../provtest/domain/DrugImportApplyInfo.java | 89 +++++--- .../provtest/domain/DrugInvoiceApplyInfo.java | 203 ++++++++++++------ .../provtest/domain/DrugRecallApplyInfo.java | 89 +++++--- .../domain/DrugRetailAndUseApplyInfo.java | 155 ++++++++----- .../domain/DrugSelfInspectionApplyInfo.java | 155 ++++++++----- .../provtest/domain/ImportedDrugBaseInfo.java | 122 +++++++---- ...rmaceuticalTradingEnterprisesBaseInfo.java | 101 ++++++--- ...dStorageDeviceRelTemperatureApplyInfo.java | 44 ++-- .../domain/RevocationOrderApplyInfo.java | 58 +++++ .../StorageDeviceTemperatureApplyInfo.java | 47 ++-- .../domain/TransportTemperatureApplyInfo.java | 53 +++-- .../domain/WarehouseStockApplyInfo.java | 107 +++++---- .../service/AbroadPharmaBaseInfoService.java | 15 -- .../service/EventProcessingService.java | 47 ---- .../handle/business/SubType1011Handler.java | 6 +- .../handle/business/SubType1012Handler.java | 6 +- .../handle/business/SubType1013Handler.java | 6 +- .../handle/business/SubType1014Handler.java | 6 +- .../handle/business/SubType1015Handler.java | 6 +- .../handle/business/SubType1016Handler.java | 6 +- .../handle/business/SubType1017Handler.java | 6 +- .../handle/business/SubType1018Handler.java | 6 +- .../handle/business/SubType2012Handler.java | 85 +++++++- .../EventProcessingServiceImpl.java} | 8 +- .../XmlParserServiceImpl.java} | 4 +- 28 files changed, 1077 insertions(+), 542 deletions(-) create mode 100644 src/main/java/com/alihealth/d2d/provtest/domain/RevocationOrderApplyInfo.java delete mode 100644 src/main/java/com/alihealth/d2d/provtest/service/AbroadPharmaBaseInfoService.java delete mode 100644 src/main/java/com/alihealth/d2d/provtest/service/EventProcessingService.java rename src/main/java/com/alihealth/d2d/provtest/service/{IEventProcessingService.java => impl/EventProcessingServiceImpl.java} (84%) rename src/main/java/com/alihealth/d2d/provtest/service/{XmlParserService.java => impl/XmlParserServiceImpl.java} (98%) diff --git a/.gitignore b/.gitignore index ed8368a..6a555ee 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ nbdist/ !*/build/*.java !*/build/*.html !*/build/*.xml +/d2d/ diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java index e2c1bf2..b1ff539 100644 --- a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java +++ b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java @@ -6,6 +6,7 @@ import com.alihealth.d2d.provtest.enums.BuzStatusEnum; import com.alihealth.d2d.provtest.enums.EventTypeEnum; import com.alihealth.d2d.provtest.enums.SubTypeEnum; import com.alihealth.d2d.provtest.service.*; +import com.alihealth.d2d.provtest.service.impl.EventProcessingServiceImpl; import com.alihealth.d2d.provtest.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,7 @@ public class ProvTestServerController { @Autowired - private IEventProcessingService processingService; + private EventProcessingServiceImpl processingService; @RequestMapping("/receive") public @ResponseBody diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java index 686474d..8e92fee 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java @@ -1,134 +1,195 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 收货单信息数据子集(DrugDeliveryNoteApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugDeliveryNoteApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_delivery_note_apply_info") +public class DrugDeliveryNoteApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //药品追溯码 +//药品追溯码 + @Column(name = "ypzsm") private String ypzsm; - //包装层级 +//包装层级 + @Column(name = "bzcj") private String bzcj; - //上一级药品追溯码 +//上一级药品追溯码 + @Column(name = "syjbzypzsm") private String syjbzypzsm; - //追溯码验证状态 +//追溯码验证状态 + @Column(name = "zsmyzzt") private String zsmyzzt; - //暂无 +//暂无 + @Column(name = "ymzt") private String ymzt; - //统一社会信用代码（生产企业） +//统一社会信用代码（生产企业） + @Column(name = "tyshxydmscqy") private String tyshxydmscqy; - //生产企业名称 +//生产企业名称 + @Column(name = "scqymc") private String scqymc; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //疫苗生产批号 +//疫苗生产批号 + @Column(name = "ymscph") private String ymscph; - //生产日期 +//生产日期 + @Column(name = "scrq") private Date scrq; - //统一社会信用代码（进口疫苗代理企业） +//统一社会信用代码（进口疫苗代理企业） + @Column(name = "tyshxydmjkymdlqy") private String tyshxydmjkymdlqy; - //进口疫苗代理企业名称 +//进口疫苗代理企业名称 + @Column(name = "jkymdlqymc") private String jkymdlqymc; - //疫苗有效期截止日期 +//疫苗有效期截止日期 + @Column(name = "ymyxqjzrq") private Date ymyxqjzrq; - //应收货数量 +//应收货数量 + @Column(name = "yshsl") private Integer yshsl; - //收货数量 +//收货数量 + @Column(name = "shsl") private Integer shsl; - //疫苗上市许可持有人名称 +//疫苗上市许可持有人名称 + @Column(name = "ymssxkcyrmc") private String ymssxkcyrmc; - //统一社会信用代码（疫苗上市许可持有人） +//统一社会信用代码（疫苗上市许可持有人） + @Column(name = "tyshxydmymssxkcyr") private String tyshxydmymssxkcyr; - //剂型 +//剂型 + @Column(name = "jx") private String jx; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //包装转换比单位 +//包装转换比单位 + @Column(name = "bzzhbdw") private String bzzhbdw; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //订货单编号 +//订货单编号 + @Column(name = "dhdbh") private String dhdbh; - //发货单编号 +//发货单编号 + @Column(name = "fhdbh") private String fhdbh; - //收货单编号 +//收货单编号 + @Column(name = "shdbh") private String shdbh; - //统一社会信用代码(发货机构) +//统一社会信用代码(发货机构) + @Column(name = "tyshxydmfhjg") private String tyshxydmfhjg; - //暂无 +//暂无 + @Column(name = "jzdwbmfhjg") private String jzdwbmfhjg; - //发货机构名称 +//发货机构名称 + @Column(name = "fhjgmc") private String fhjgmc; - //发货地址 +//发货地址 + @Column(name = "fhdz") private String fhdz; - //统一社会信用代码(收货机构) +//统一社会信用代码(收货机构) + @Column(name = "tyshxydmshjg") private String tyshxydmshjg; - //暂无 +//暂无 + @Column(name = "jzdwbmshjg") private String jzdwbmshjg; - //收货地址 +//收货地址 + @Column(name = "shdz") private String shdz; - //收货机构名称 +//收货机构名称 + @Column(name = "shjgmc") private String shjgmc; - //收货类型 +//收货类型 + @Column(name = "shlx") private String shlx; - //收货时间 +//收货时间 + @Column(name = "shsj") private Date shsj; - //单据验证状态 +//单据验证状态 + @Column(name = "djyzzt") private String djyzzt; - //单据验证日期 +//单据验证日期 + @Column(name = "djyzrq") private Date djyzrq; - //单据验证未通过原因 +//单据验证未通过原因 + @Column(name = "djyzwtgyy") private String djyzwtgyy; - //收货人 +//收货人 + @Column(name = "shr") private String shr; - //发货机构类型 +//发货机构类型 + @Column(name = "fhjglx") private String fhjglx; - //收货机构类型 +//收货机构类型 + @Column(name = "shjglx") private String shjglx; - //发货机构小类 +//发货机构小类 + @Column(name = "fhjgxl") private String fhjgxl; - //收货机构小类 +//收货机构小类 + @Column(name = "shjgxl") private String shjgxl; - //卫生机构代码（收货机构） +//卫生机构代码（收货机构） + @Column(name = "wsjgdmshjg") private String wsjgdmshjg; - //卫生机构代码（发货机构） +//卫生机构代码（发货机构） + @Column(name = "wsjgdmfhjg") private String wsjgdmfhjg; - //执业许可证登记号/诊所备案编号（发货机构） +//执业许可证登记号/诊所备案编号（发货机构） + @Column(name = "zyxkzdjhfhjg") private String zyxkzdjhfhjg; - //执业许可证登记号/诊所备案编号（收货机构） +//执业许可证登记号/诊所备案编号（收货机构） + @Column(name = "zyxkzdjhshjg") private String zyxkzdjhshjg; - //委托单位名称 +//委托单位名称 + @Column(name = "wtdwmc") private String wtdwmc; - //委托单位统一社会信用代码 +//委托单位统一社会信用代码 + @Column(name = "wtdwtyshxydm") private String wtdwtyshxydm; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java index 2fdc6fe..f533025 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java @@ -1,70 +1,99 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 药品进口信息数据子集(DrugImportApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugImportApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_import_apply_info") +public class DrugImportApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //药品追溯码 +//药品追溯码 + @Column(name = "ypzsm") private String ypzsm; - //上一级包装药品追溯码 +//上一级包装药品追溯码 + @Column(name = "syjbzypzsm") private String syjbzypzsm; - //包装层级 +//包装层级 + @Column(name = "bzcj") private String bzcj; - //暂无 +//暂无 + @Column(name = "ymzt") private String ymzt; - //统一社会信用代码（进口疫苗代理企业） +//统一社会信用代码（进口疫苗代理企业） + @Column(name = "tyshxydmjkymdlqy") private String tyshxydmjkymdlqy; - //进口疫苗代理企业名称 +//进口疫苗代理企业名称 + @Column(name = "jkymdlqymc") private String jkymdlqymc; - //境外药品上市许可持有人代码 +//境外药品上市许可持有人代码 + @Column(name = "jwypssxkcyrdm") private String jwypssxkcyrdm; - //境外药品上市许可持有人名称（中文） +//境外药品上市许可持有人名称（中文） + @Column(name = "jwypssxkcyrmczw") private String jwypssxkcyrmczw; - //境外药品生产企业代码 +//境外药品生产企业代码 + @Column(name = "jwypscqydm") private String jwypscqydm; - //境外药品生产企业名称（中文） +//境外药品生产企业名称（中文） + @Column(name = "jwypscqymczw") private String jwypscqymczw; - //统一社会信用代码（分包装厂） +//统一社会信用代码（分包装厂） + @Column(name = "tyshxydmfbzc") private String tyshxydmfbzc; - //分包装厂名称 +//分包装厂名称 + @Column(name = "fbzcmc") private String fbzcmc; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品生产批号 +//药品生产批号 + @Column(name = "ymscph") private String ymscph; - //药品生产日期 +//药品生产日期 + @Column(name = "scrq") private Date scrq; - //药品有效期截止日期 +//药品有效期截止日期 + @Column(name = "ymyxqjzrq") private Date ymyxqjzrq; - //生产数量 +//生产数量 + @Column(name = "scsl") private Integer scsl; - //入库编号 +//入库编号 + @Column(name = "rkdbh") private String rkdbh; - //入库时间 +//入库时间 + @Column(name = "rksj") private Date rksj; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java index a51bbf9..125b1b6 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java @@ -1,134 +1,213 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 发货单信息数据子集(DrugInvoiceApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugInvoiceApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_invoice_apply_info") +public class DrugInvoiceApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //统一社会信用代码 +//药品追溯码 + @Column(name = "ypzsm") + private String ypzsm; +//上一级包装药品追溯码 + @Column(name = "syjbzypzsm") + private String syjbzypzsm; +//包装层级 + @Column(name = "bzcj") + private String bzcj; +//暂无 + @Column(name = "ymzt") + private String ymzt; +//统一社会信用代码 + @Column(name = "tyshxydmscqy") private String tyshxydmscqy; - //药品生产企业名称 +//药品生产企业名称 + @Column(name = "scqymc") private String scqymc; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品生产批号 +//药品生产批号 + @Column(name = "ymscph") private String ymscph; - //统一社会信用代码(进口代理企业) +//统一社会信用代码(进口代理企业) + @Column(name = "tyshxydmjkymdlqy") private String tyshxydmjkymdlqy; - //进口疫苗代理企业名称 +//进口疫苗代理企业名称 + @Column(name = "jkymdlqymc") private String jkymdlqymc; - //药品生产日期 +//药品生产日期 + @Column(name = "scrq") private Date scrq; - //药品有效期截止日期 +//药品有效期截止日期 + @Column(name = "ymyxqjzrq") private Date ymyxqjzrq; - //发货数量 +//发货数量 + @Column(name = "fhsl") private Integer fhsl; - //剂型 +//药品批准文号 + @Column(name = "yppzwh") + private String yppzwh; +//药品批准文号有效期 + @Column(name = "yppzwhyxq") + private Date yppzwhyxq; +//剂型 + @Column(name = "jx") private String jx; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //包装转换比单位 +//包装转换比单位 + @Column(name = "bzzhbdw") private String bzzhbdw; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //药检报告签收状态 +//药检报告签收状态 + @Column(name = "yjbgqszt") private String yjbgqszt; - //药检报告盖章状态 +//药检报告盖章状态 + @Column(name = "yjbggzzt") private String yjbggzzt; - //发货单编号 +//发货单编号 + @Column(name = "fhdbh") private String fhdbh; - //订货单编号 +//订货单编号 + @Column(name = "dhdbh") private String dhdbh; - //统一社会信用代码（发货机构） +//统一社会信用代码（发货机构） + @Column(name = "tyshxydmfhjg") private String tyshxydmfhjg; - //暂不用字段 +//暂不用字段 + @Column(name = "jzdwbmfhjg") private String jzdwbmfhjg; - //发货机构名称 +//发货机构名称 + @Column(name = "fhjgmc") private String fhjgmc; - //发货地址 +//发货地址 + @Column(name = "fhdz") private String fhdz; - //发货类型 +//发货类型 + @Column(name = "fhlx") private String fhlx; - //发货时间 +//发货时间 + @Column(name = "fhsj") private Date fhsj; - //统一社会信用代码（收货机构） +//统一社会信用代码（收货机构） + @Column(name = "tyshxydmshjg") private String tyshxydmshjg; - //暂无 +//暂无 + @Column(name = "jzdwbmshjg") private String jzdwbmshjg; - //收货地址 +//收货地址 + @Column(name = "shdz") private String shdz; - //收货机构名称 +//收货机构名称 + @Column(name = "shjgmc") private String shjgmc; - //统一社会信用代码（派送单位） +//统一社会信用代码（派送单位） + @Column(name = "tyshxydmympsdw") private String tyshxydmympsdw; - //药品配送单位名称 +//药品配送单位名称 + @Column(name = "ympsdwmc") private String ympsdwmc; - //单据验证状态 +//单据验证状态 + @Column(name = "djyzzt") private String djyzzt; - //单据验证日期 +//单据验证日期 + @Column(name = "djyzrq") private Date djyzrq; - //单据验证未通过原因 +//单据验证未通过原因 + @Column(name = "djyzwtgyy") private String djyzwtgyy; - //发货单操作人 +//发货单操作人 + @Column(name = "fhdczr") private String fhdczr; - //发货单上传时间 +//发货单上传时间 + @Column(name = "fhdscsj") private Date fhdscsj; - //发货人 +//发货人 + @Column(name = "fhr") private String fhr; - //发货机构类型 +//发货机构类型 + @Column(name = "fhjglx") private String fhjglx; - //收货机构类型 +//收货机构类型 + @Column(name = "shjglx") private String shjglx; - //发货机构小类 +//发货机构小类 + @Column(name = "fhjgxl") private String fhjgxl; - //收货机构小类 +//收货机构小类 + @Column(name = "shjgxl") private String shjgxl; - //卫生机构代码（收货机构） +//卫生机构代码（收货机构） + @Column(name = "wsjgdmshjg") private String wsjgdmshjg; - //卫生机构代码（发货机构） +//卫生机构代码（发货机构） + @Column(name = "wsjgdmfhjg") private String wsjgdmfhjg; - //执业许可证登记号/诊所备案编号（发货机构） +//执业许可证登记号/诊所备案编号（发货机构） + @Column(name = "zyxkzdjhfhjg") private String zyxkzdjhfhjg; - //执业许可证登记号/诊所备案编号（收货机构） +//执业许可证登记号/诊所备案编号（收货机构） + @Column(name = "zyxkzdjhshjg") private String zyxkzdjhshjg; - //委托单位名称 +//委托单位名称 + @Column(name = "wtdwmc") private String wtdwmc; - //委托单位统一社会信用代码 +//委托单位统一社会信用代码 + @Column(name = "wtdwtyshxydm") private String wtdwtyshxydm; - //拒收标识 +//拒收标识 + @Column(name = "jsbs") private String jsbs; - //拒收原因 +//拒收原因 + @Column(name = "jsyy") private String jsyy; - //拒收时间 +//拒收时间 + @Column(name = "jssj") private Date jssj; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java index 2c4464f..35215a2 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java @@ -1,70 +1,99 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 药品召回信息数据子集(DrugRecallApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugRecallApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_recall_apply_info") +public class DrugRecallApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //药品追溯码 +//药品追溯码 + @Column(name = "ypzsm") private String ypzsm; - //上一级包装药品追溯码 +//上一级包装药品追溯码 + @Column(name = "bzcj") private String bzcj; - //包装层级 +//包装层级 + @Column(name = "syjbzypzsm") private String syjbzypzsm; - //暂无 +//暂无 + @Column(name = "ymzt") private String ymzt; - //统一社会信用代码（生产企业） +//统一社会信用代码（生产企业） + @Column(name = "tyshxydmscqy") private String tyshxydmscqy; - //生产企业名称 +//生产企业名称 + @Column(name = "scqymc") private String scqymc; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家基本药物标识 +//国家基本药物标识 + @Column(name = "gjypbsm") private String gjypbsm; - //疫苗生产批号 +//疫苗生产批号 + @Column(name = "ymscph") private String ymscph; - //统一社会信用代码（进口疫苗代理企业） +//统一社会信用代码（进口疫苗代理企业） + @Column(name = "tyshxydmjkymdlqy") private String tyshxydmjkymdlqy; - //进口疫苗代理企业名称 +//进口疫苗代理企业名称 + @Column(name = "jkymdlqymc") private String jkymdlqymc; - //生产日期 +//生产日期 + @Column(name = "scrq") private Date scrq; - //疫苗有效期截止日期 +//疫苗有效期截止日期 + @Column(name = "ymyxqjzrq") private Date ymyxqjzrq; - //召回数量 +//召回数量 + @Column(name = "zhsl") private Integer zhsl; - //计划召回数量 +//计划召回数量 + @Column(name = "jhzhsl") private Integer jhzhsl; - //到期实际召回数量 +//到期实际召回数量 + @Column(name = "dqsjzhsl") private Integer dqsjzhsl; - //统一社会信用代码（召回机构） +//统一社会信用代码（召回机构） + @Column(name = "tyshxydmzhjg") private String tyshxydmzhjg; - //召回机构名称 +//召回机构名称 + @Column(name = "zhjgmc") private String zhjgmc; - //开始统计时间 +//开始统计时间 + @Column(name = "kstjsj") private Date kstjsj; - //结束统计时间 +//结束统计时间 + @Column(name = "jstjsj") private Date jstjsj; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java index 46d325e..02caf3a 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java @@ -1,114 +1,165 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 药品零售与药品使用信息数据子集(DrugRetailAndUseApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugRetailAndUseApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_retail_and_use_apply_info") +public class DrugRetailAndUseApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //药品追溯码 +//药品追溯码 + @Column(name = "ypzsm") private String ypzsm; - //上一级包装药品追溯码 +//上一级包装药品追溯码 + @Column(name = "bzcj") private String bzcj; - //包装层级 +//包装层级 + @Column(name = "syjbzypzsm") private String syjbzypzsm; - //暂无 +//暂无 + @Column(name = "ymzt") private String ymzt; - //统一社会信用代码（境内药品生产企业） +//统一社会信用代码（境内药品生产企业） + @Column(name = "tyshxydmjnypscqy") private String tyshxydmjnypscqy; - //境内药品生产企业名称 +//境内药品生产企业名称 + @Column(name = "jnypscqymc") private String jnypscqymc; - //境外药品生产企业代码 +//境外药品生产企业代码 + @Column(name = "jwypscqydm") private String jwypscqydm; - //境外药品生产企业名称（中文） +//境外药品生产企业名称（中文） + @Column(name = "jwypscqymczw") private String jwypscqymczw; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品批准文号 +//药品批准文号 + @Column(name = "yppzwh") private String yppzwh; - //药品批准文号有效期 +//药品批准文号有效期 + @Column(name = "yppzwhyxq") private Date yppzwhyxq; - //疫苗生产批号 +//疫苗生产批号 + @Column(name = "ymscph") private String ymscph; - //生产日期 +//生产日期 + @Column(name = "scrq") private Date scrq; - //药品有效期截止日期 +//药品有效期截止日期 + @Column(name = "ypyxqjzrq") private Date ypyxqjzrq; - //售药日期 +//售药日期 + @Column(name = "syrq") private Date syrq; - //统一社会信用代码（进口疫苗代理企业） +//统一社会信用代码（进口疫苗代理企业） + @Column(name = "tyshxydmjkymdlqy") private String tyshxydmjkymdlqy; - //进口疫苗代理企业名称 +//进口疫苗代理企业名称 + @Column(name = "jkymdlqymc") private String jkymdlqymc; - //售药数量 +//售药数量 + @Column(name = "sysl") private Integer sysl; - //售出时间 +//售出时间 + @Column(name = "scsj") private Date scsj; - //购买人身份信息 +//购买人身份信息 + @Column(name = "gmrsfxx") private String gmrsfxx; - //购买人电话号码 +//购买人电话号码 + @Column(name = "gmrdhhm") private String gmrdhhm; - //互联网订单标志 +//互联网订单标志 + @Column(name = "hlwddbz") private String hlwddbz; - //剂型 +//剂型 + @Column(name = "jx") private String jx; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //包装转换比单位 +//包装转换比单位 + @Column(name = "bzzhbdw") private String bzzhbdw; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //统一社会信用代码（零售药店） +//统一社会信用代码（零售药店） + @Column(name = "tyshxydmlsyd") private String tyshxydmlsyd; - //执业许可证登记号 +//执业许可证登记号 + @Column(name = "zyxkzdjh") private String zyxkzdjh; - //零售药店名称 +//零售药店名称 + @Column(name = "lsydmc") private String lsydmc; - //售药单位类型 +//售药单位类型 + @Column(name = "sydwlx") private String sydwlx; - //售药单位类型小类 +//售药单位类型小类 + @Column(name = "sydwlxxl") private String sydwlxxl; - //零售药店编号 +//零售药店编号 + @Column(name = "lsdjbh") private String lsdjbh; - //经营许可证编号 +//经营许可证编号 + @Column(name = "jyxkzbh") private String jyxkzbh; - //卫生机构代码 +//卫生机构代码 + @Column(name = "wsjgdm") private String wsjgdm; - //开方医师 +//开方医师 + @Column(name = "kfys") private String kfys; - //药品发药人 +//药品发药人 + @Column(name = "ypfyr") private String ypfyr; - //药品使用者 +//药品使用者 + @Column(name = "ypsyz") private String ypsyz; - //药品使用者代理人 +//药品使用者代理人 + @Column(name = "ypsyzdlr") private String ypsyzdlr; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java index b1fab17..7f240f3 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java @@ -1,114 +1,165 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 药品自检信息数据子集(DrugSelfInspectionApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class DrugSelfInspectionApplyInfo extends Model { - //主键ID +@Builder +@TableName("drug_self_inspection_apply_info") +public class DrugSelfInspectionApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //药品英文名称 +//药品英文名称 + @Column(name = "ypywmc") private String ypywmc; - //进口药品中文译名 +//进口药品中文译名 + @Column(name = "jkypzwym") private String jkypzwym; - //药品商品名称 +//药品商品名称 + @Column(name = "ypspmc") private String ypspmc; - //药品本位码 +//药品本位码 + @Column(name = "ypbwm") private String ypbwm; - //剂型 +//剂型 + @Column(name = "jx") private String jx; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //药品有效期 +//药品有效期 + @Column(name = "ypyxq") private Integer ypyxq; - //药品有效期单位 +//药品有效期单位 + @Column(name = "ypyxqdw") private String ypyxqdw; - //药品批准文号 +//药品批准文号 + @Column(name = "yppzwh") private String yppzwh; - //药品批准文号有效期 +//药品批准文号有效期 + @Column(name = "yppzwhyxq") private Date yppzwhyxq; - //进口药品注册证号 +//进口药品注册证号 + @Column(name = "jkypzczh") private String jkypzczh; - //进口药品注册证有效期 +//进口药品注册证有效期 + @Column(name = "jkypzczyxq") private Date jkypzczyxq; - //进口药品批件号 +//进口药品批件号 + @Column(name = "jkyppjh") private String jkyppjh; - //进口药品批件有效期 +//进口药品批件有效期 + @Column(name = "jkyppjyxq") private Date jkyppjyxq; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //国家基本药物标识 +//国家基本药物标识 + @Column(name = "gjjbywbs") private String gjjbywbs; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //处方药标识 +//处方药标识 + @Column(name = "cfybs") private String cfybs; - //境内药品上市许可持有人名称 +//境内药品上市许可持有人名称 + @Column(name = "jnypssxkcyrmc") private String jnypssxkcyrmc; - //统一社会信用代码（境内药品上市许可持有人） +//统一社会信用代码（境内药品上市许可持有人） + @Column(name = "tyshxydmjnypssxkcyr") private String tyshxydmjnypssxkcyr; - //境外药品上市许可持有人名称（中文） +//境外药品上市许可持有人名称（中文） + @Column(name = "jwypssxkcyrmczw") private String jwypssxkcyrmczw; - //境外药品上市许可持有人名称（英文） +//境外药品上市许可持有人名称（英文） + @Column(name = "jwypssxkcyrmcyw") private String jwypssxkcyrmcyw; - //境外药品上市许可持有人代码 +//境外药品上市许可持有人代码 + @Column(name = "jwypssxkcyrdm") private String jwypssxkcyrdm; - //境内药品生产企业名称 +//境内药品生产企业名称 + @Column(name = "jnypscqymc") private String jnypscqymc; - //统一社会信用代码(境内药品生产企业) +//统一社会信用代码(境内药品生产企业) + @Column(name = "tyshxydmjnypscqy") private String tyshxydmjnypscqy; - //境外药品生产企业名称（中文） +//境外药品生产企业名称（中文） + @Column(name = "jwypscqymczw") private String jwypscqymczw; - //境外药品生产企业名称（英文） +//境外药品生产企业名称（英文） + @Column(name = "jwypscqymcyw") private String jwypscqymcyw; - //境外药品生产企业代码 +//境外药品生产企业代码 + @Column(name = "jwypscqydm") private String jwypscqydm; - //分包装厂名称 +//分包装厂名称 + @Column(name = "fbzcmc") private String fbzcmc; - //统一社会信用代码（分包装厂） +//统一社会信用代码（分包装厂） + @Column(name = "tyshxydmfbzc") private String tyshxydmfbzc; - //药品生产日期 +//药品生产日期 + @Column(name = "ypscrq") private Date ypscrq; - //药品有效期截止日期 +//药品有效期截止日期 + @Column(name = "ypyxqjzrq") private Date ypyxqjzrq; - //药品生产批号 +//药品生产批号 + @Column(name = "ypscph") private String ypscph; - //报告日期 +//报告日期 + @Column(name = "bgrq") private Date bgrq; - //签章日期 +//签章日期 + @Column(name = "gzrq") private Date gzrq; - //药品检验报告书编号 +//药品检验报告书编号 + @Column(name = "ypjybgsbh") private String ypjybgsbh; - //药品检验日期 +//药品检验日期 + @Column(name = "ymjyrq") private Date ymjyrq; - //药品检验报告扫描件 +//药品检验报告扫描件 + @Column(name = "ypjybgsmj") private String ypjybgsmj; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java index 84cd6a1..850ca68 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java @@ -1,92 +1,132 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 进口药品基本信息数据子集(ImportedDrugBaseInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class ImportedDrugBaseInfo extends Model { - //主键ID +@Builder +@TableName("imported_drug_base_info") +public class ImportedDrugBaseInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品英文名称 +//药品英文名称 + @Column(name = "ypywmc") private String ypywmc; - //进口药品中文译名 +//进口药品中文译名 + @Column(name = "jkypzwym") private String jkypzwym; - //药品商品名称 +//药品商品名称 + @Column(name = "ypspmc") private String ypspmc; - //药品本位码 +//药品本位码 + @Column(name = "ypbwm") private String ypbwm; - //剂型 +//剂型 + @Column(name = "jx") private String jx; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //包装转换比单位 +//包装转换比单位 + @Column(name = "bzzhbdw") private String bzzhbdw; - //药品有效期 +//药品有效期 + @Column(name = "ypyxq") private Integer ypyxq; - //药品有效期单位 +//药品有效期单位 + @Column(name = "ypyxqdw") private String ypyxqdw; - //药品批准文号 +//药品批准文号 + @Column(name = "yppzwh") private String yppzwh; - //药品批准文号有效期 +//药品批准文号有效期 + @Column(name = "yppzwhyxq") private Date yppzwhyxq; - //进口药品注册证号 +//进口药品注册证号 + @Column(name = "jkypzczh") private String jkypzczh; - //进口药品注册证有效期 +//进口药品注册证有效期 + @Column(name = "jkypzczyxq") private Date jkypzczyxq; - //进口药品批件号 +//进口药品批件号 + @Column(name = "jkyppjh") private String jkyppjh; - //进口药品批件有效期 +//进口药品批件有效期 + @Column(name = "jkyppjyxq") private Date jkyppjyxq; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //国家基本药物标识 +//国家基本药物标识 + @Column(name = "gjjbywbs") private String gjjbywbs; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //处方药标识 +//处方药标识 + @Column(name = "cfybs") private String cfybs; - //境外药品上市许可持有人代码 +//境外药品上市许可持有人代码 + @Column(name = "jwypssxkcyrdm") private String jwypssxkcyrdm; - //境外药品生产企业代码 +//境外药品生产企业代码 + @Column(name = "jwypscqydm") private String jwypscqydm; - //分包装厂名称 +//分包装厂名称 + @Column(name = "fbzcmc") private String fbzcmc; - //统一社会信用代码（分包装厂） +//统一社会信用代码（分包装厂） + @Column(name = "tyshxydmfbzc") private String tyshxydmfbzc; - //分包装厂地址 +//分包装厂地址 + @Column(name = "fbzcdz") private String fbzcdz; - //进口药品代理企业名称 +//进口药品代理企业名称 + @Column(name = "jkypdlqymc") private String jkypdlqymc; - //统一社会信用代码(进口药品代理企业) +//统一社会信用代码(进口药品代理企业) + @Column(name = "tyshxydmjkypdlqy") private String tyshxydmjkypdlqy; - //暂无 +//暂无 + @Column(name = "sczt") private String sczt; - //包装规格标识 +//包装规格标识 + @Column(name = "bzggbs") private String bzggbs; - //子集：bzbl-包装比例 、bzjb-包装级别 、ypbsm-药品标识码 +//子集：bzbl-包装比例 、bzjb-包装级别 、ypbsm-药品标识码 + @Column(name = "basqxqs") private String basqxqs; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java index 4f44bf8..14254ce 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java @@ -1,78 +1,111 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 药品经营企业基本信息数据子集(PharmaceuticalTradingEnterprisesBaseInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:40 */ @SuppressWarnings("serial") @Data -public class PharmaceuticalTradingEnterprisesBaseInfo extends Model { - //主键ID +@Builder +@TableName("pharmaceutical_trading_enterprises_base_info") +public class PharmaceuticalTradingEnterprisesBaseInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //统一社会信用代码 +//统一社会信用代码 + @Column(name = "tyshxydm") private String tyshxydm; - //企业名称 +//企业名称 + @Column(name = "qymc") private String qymc; - //企业类型 +//企业类型 + @Column(name = "qylx") private String qylx; - //企业小类 +//企业小类 + @Column(name = "qyxl") private String qyxl; - //住所地址 +//住所地址 + @Column(name = "zsdz") private String zsdz; - //住所地址- 国家（或地区） +//住所地址- 国家（或地区） + @Column(name = "zsdzgjhdq") private String zsdzgjhdq; - //住所地址- 省（直辖市/自治区） +//住所地址- 省（直辖市/自治区） + @Column(name = "zsdzszxszzq") private String zsdzszxszzq; - //住所地址- 市（区/自治州/盟） +//住所地址- 市（区/自治州/盟） + @Column(name = "zsdzsqzzzm") private String zsdzsqzzzm; - //住所地址- 县（自治县/县级市） +//住所地址- 县（自治县/县级市） + @Column(name = "zsdzxzzxxjs") private String zsdzxzzxxjs; - //住所地址-乡（镇/街道办事处） +//住所地址-乡（镇/街道办事处） + @Column(name = "zsdzxzjdbsc") private String zsdzxzjdbsc; - //住所地址-村（街/路/ 弄等） +//住所地址-村（街/路/ 弄等） + @Column(name = "zsdzcjlld") private String zsdzcjlld; - //住所地址-门牌号码 +//住所地址-门牌号码 + @Column(name = "zsdzmphm") private String zsdzmphm; - //法定代表人 +//法定代表人 + @Column(name = "fddbr") private String fddbr; - //注册资本 +//注册资本 + @Column(name = "zczb") private String zczb; - //成立日期 +//成立日期 + @Column(name = "clrq") private Date clrq; - //营业期限 +//营业期限 + @Column(name = "yyqx") private String yyqx; - //经营范围 +//经营范围 + @Column(name = "jyfw") private String jyfw; - //登记机关 +//登记机关 + @Column(name = "djjg") private String djjg; - //固定电话号码 +//固定电话号码 + @Column(name = "gddhhm") private String gddhhm; - //传真号码 +//传真号码 + @Column(name = "czhm") private String czhm; - //电子信箱 +//电子信箱 + @Column(name = "dzxx") private String dzxx; - //企业网址 +//企业网址 + @Column(name = "qywz") private String qywz; - //联系人 +//联系人 + @Column(name = "lxr") private String lxr; - //联系电话 +//联系电话 + @Column(name = "lxdh") private String lxdh; - //暂无 +//暂无 + @Column(name = "zsgps") private String zsgps; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java index 6d93f19..d74f5ec 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java @@ -1,40 +1,54 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 温度信息子集-单据与存储设备关系信息(ReceiptAndStorageDeviceRelTemperatureApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:41 */ @SuppressWarnings("serial") @Data -public class ReceiptAndStorageDeviceRelTemperatureApplyInfo extends Model { - //主键ID +@Builder +@TableName("receipt_and_storage_device_rel_temperature_apply_info") +public class ReceiptAndStorageDeviceRelTemperatureApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //统一社会信用代码 +//统一社会信用代码 + @Column(name = "tyshxydm") private String tyshxydm; - //企业名称 +//企业名称 + @Column(name = "qymc") private String qymc; - //生产信息或进口信息或收货单号 +//生产信息或进口信息或收货单号 + @Column(name = "djh") private String djh; - //单据类型 +//单据类型 + @Column(name = "djlx") private String djlx; - //存储设备编号 +//存储设备编号 + @Column(name = "ccsbbh") private String ccsbbh; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/RevocationOrderApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/RevocationOrderApplyInfo.java new file mode 100644 index 0000000..4a7cc09 --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/domain/RevocationOrderApplyInfo.java @@ -0,0 +1,58 @@ +package com.alihealth.d2d.provtest.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; +import lombok.Data; + +import javax.persistence.Column; +import java.util.Date; +/** + * 撤销单(RevocationOrderApplyInfo)表实体类 + * + * @author makejava + * @since 2025-06-11 17:43:41 + */ +@SuppressWarnings("serial") +@Data +@Builder +@TableName("revocation_order_apply_info") +public class RevocationOrderApplyInfo { +//主键ID + @Column(name = "id") + private Long id; +//事件流水号 + @Column(name = "event_id") + private String eventId; +//事件响应时间 + @Column(name = "rec_time") + private Date recTime; +//原始单单据号 + @Column(name = "ysddjh") + private String ysddjh; +//撤销原因 + @Column(name = "cxyy") + private String cxyy; +//撤销时间 + @Column(name = "cxsj") + private Date cxsj; +//原始单流水号 + @Column(name = "ysdlsh") + private String ysdlsh; +//单据类型 + @Column(name = "djlx") + private String djlx; +//国家药品标识码 + @Column(name = "gjypbsm") + private String gjypbsm; +//创建时间 + @Column(name = "create_time") + private Date createTime; +//更新时间 + @Column(name = "update_time") + private Date updateTime; +//是否删除(0-否 1-是) + @Column(name = "is_deleted") + private Integer isDeleted; + +} + diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java index 8a440de..52e2a38 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java @@ -1,42 +1,57 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 温度信息子集-存储设备温度信息(StorageDeviceTemperatureApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:41 */ @SuppressWarnings("serial") @Data -public class StorageDeviceTemperatureApplyInfo extends Model { - //主键ID +@Builder +@TableName("storage_device_temperature_apply_info") +public class StorageDeviceTemperatureApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //统一社会信用代码 +//统一社会信用代码 + @Column(name = "tyshxydm") private String tyshxydm; - //企业名称 +//企业名称 + @Column(name = "qymc") private String qymc; - //存储设备编号 +//存储设备编号 + @Column(name = "ccsbbh") private String ccsbbh; - //存储设备名称 +//存储设备名称 + @Column(name = "ccsbmc") private String ccsbmc; - //存储设备类型 +//存储设备类型 + @Column(name = "ccsblx") private String ccsblx; - //温度信息 +//温度信息 + @Column(name = "wdxx") private String wdxx; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java index f3f53dc..6115312 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java @@ -1,46 +1,63 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 温度信息子集-运输温度信息(TransportTemperatureApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:41 */ @SuppressWarnings("serial") @Data -public class TransportTemperatureApplyInfo extends Model { - //主键ID +@Builder +@TableName("transport_temperature_apply_info") +public class TransportTemperatureApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //统一社会信用代码 +//统一社会信用代码 + @Column(name = "tyshxydm") private String tyshxydm; - //企业名称 +//企业名称 + @Column(name = "qymc") private String qymc; - //发货单号 +//发货单号 + @Column(name = "fhdh") private String fhdh; - //温度信息 +//温度信息 + @Column(name = "wdxx") private String wdxx; - //存储设备编号 +//存储设备编号 + @Column(name = "ccsbbh") private String ccsbbh; - //存储设备名称 +//存储设备名称 + @Column(name = "ccsbmc") private String ccsbmc; - //运输企业统一社会信用代码 +//运输企业统一社会信用代码 + @Column(name = "ysqytyshxydm") private String ysqytyshxydm; - //运输企业名称 +//运输企业名称 + @Column(name = "ysqyqymc") private String ysqyqymc; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java index 9b15000..e0b3504 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java @@ -1,82 +1,117 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; import lombok.Data; +import javax.persistence.Column; import java.util.Date; - /** * 库存上报基本信息数据子集(可选)(WarehouseStockApplyInfo)表实体类 * * @author makejava - * @since 2025-06-10 12:39:23 + * @since 2025-06-11 17:43:41 */ @SuppressWarnings("serial") @Data -public class WarehouseStockApplyInfo extends Model { - //主键ID +@Builder +@TableName("warehouse_stock_apply_info") +public class WarehouseStockApplyInfo { +//主键ID + @Column(name = "id") private Long id; - //事件流水号 +//事件流水号 + @Column(name = "event_id") private String eventId; - //事件响应时间 +//事件响应时间 + @Column(name = "rec_time") private Date recTime; - //药品通用名称 +//药品通用名称 + @Column(name = "yptymc") private String yptymc; - //国家药品标识码 +//国家药品标识码 + @Column(name = "gjypbsm") private String gjypbsm; - //药品生产批号 +//药品生产批号 + @Column(name = "ypscph") private String ypscph; - //药品生产日期 +//药品生产日期 + @Column(name = "ypscrq") private Date ypscrq; - //药品有效期截止日期 +//药品有效期截止日期 + @Column(name = "ypyxqjzrq") private Date ypyxqjzrq; - //库存制剂数量 +//库存制剂数量 + @Column(name = "kcsl") private Integer kcsl; - //实际库存数量 +//实际库存数量 + @Column(name = "sjkcsl") private Integer sjkcsl; - //批准文号 +//批准文号 + @Column(name = "yppzwh") private String yppzwh; - //药品上市许可持有人代码 +//药品上市许可持有人代码 + @Column(name = "ypssxkcyrdm") private String ypssxkcyrdm; - //药品上市许可持有人 +//药品上市许可持有人 + @Column(name = "ypssxkcyrmc") private String ypssxkcyrmc; - //药品生产企业统一社会信用代码 +//药品生产企业统一社会信用代码 + @Column(name = "ypscqydm") private String ypscqydm; - //药品生产企业名称 +//药品生产企业名称 + @Column(name = "ypscqymc") private String ypscqymc; - //剂型 +//剂型 + @Column(name = "jx") private String jx; - //包装规格 +//包装规格 + @Column(name = "bzgg") private String bzgg; - //制剂规格 +//制剂规格 + @Column(name = "zjgg") private String zjgg; - //包装转换比 +//包装转换比 + @Column(name = "bzzhb") private Double bzzhb; - //包装转换比单位 +//包装转换比单位 + @Column(name = "bzzhbdw") private String bzzhbdw; - //药品注册分类 +//药品注册分类 + @Column(name = "ypzcfl") private String ypzcfl; - //特殊药品管理分类 +//特殊药品管理分类 + @Column(name = "tsypglfl") private String tsypglfl; - //统一社会信用代码（库存单位） +//统一社会信用代码（库存单位） + @Column(name = "tyshxydmkcdw") private String tyshxydmkcdw; - //库存单位编码(库存单位) +//库存单位编码(库存单位) + @Column(name = "kcdwjzdwbm") private String kcdwjzdwbm; - //库存统计时间 +//库存统计时间 + @Column(name = "kctjsj") private Date kctjsj; - //库存地址 +//库存地址 + @Column(name = "ckdz") private String ckdz; - //库存单位名称 +//库存单位名称 + @Column(name = "kcdwmc") private String kcdwmc; - //库存单位类型 +//库存单位类型 + @Column(name = "kcdwlx") private String kcdwlx; - //库存单位类型小类 +//库存单位类型小类 + @Column(name = "kcdwlxxl") private String kcdwlxxl; - //创建时间 +//创建时间 + @Column(name = "create_time") private Date createTime; - //更新时间 +//更新时间 + @Column(name = "update_time") private Date updateTime; - //是否删除(0-否 1-是) +//是否删除(0-否 1-是) + @Column(name = "is_deleted") private Integer isDeleted; } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/AbroadPharmaBaseInfoService.java b/src/main/java/com/alihealth/d2d/provtest/service/AbroadPharmaBaseInfoService.java deleted file mode 100644 index 8b3ab35..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/service/AbroadPharmaBaseInfoService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.alihealth.d2d.provtest.service; - -import com.alihealth.d2d.provtest.domain.AbroadPharmaBaseInfo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 境外药品生产企业基本信息数据子集(AbroadPharmaBaseInfo)表服务接口 - * - * @author makejava - * @since 2025-06-10 14:48:29 - */ -public interface AbroadPharmaBaseInfoService extends IService { - -} - diff --git a/src/main/java/com/alihealth/d2d/provtest/service/EventProcessingService.java b/src/main/java/com/alihealth/d2d/provtest/service/EventProcessingService.java deleted file mode 100644 index 1a56343..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/service/EventProcessingService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.alihealth.d2d.provtest.service; - -import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; -import com.alihealth.d2d.provtest.entity.VTTSBasic; -import com.alihealth.d2d.provtest.entity.VTTSEventS; -import com.alihealth.d2d.provtest.factory.EventHandlerFactory; -import com.alihealth.d2d.provtest.service.handle.EventDataHandler; -import com.alihealth.d2d.provtest.utils.EventPojo; -import lombok.RequiredArgsConstructor; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -/** - * @author Jason 事件主处理服务 - * @date 2025年06月05日 11:28:56 - */ -@Service -@RequiredArgsConstructor -public class EventProcessingService { - - private final XmlParserService xmlParserService; - private final EventHandlerFactory handlerFactory; - - /** - * 解析xml并处理接收的事件 - * @param eventPojo - * @param xml - * @param eventId - */ - @Async - public void processEvent(EventPojo eventPojo, String xml,String eventId) { - EventDataHandler handler = handlerFactory.getHandler(eventPojo.getSubType()); - if(eventPojo.getSubType().startsWith("20")) {//应用数据 - VTTSEventS eventS = null; - try { - eventS = xmlParserService.parseAppDataXml(xml); - } catch (Exception e) { - throw new RuntimeException(e); - } - handler.handle(eventS); - }else{ - handler.handleBase(xml,eventId); - } - - } - -} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1011Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1011Handler.java index a0d99d7..353e19a 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1011Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1011Handler.java @@ -3,7 +3,7 @@ package com.alihealth.d2d.provtest.service.handle.business; import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; import com.alihealth.d2d.provtest.entity.*; import com.alihealth.d2d.provtest.service.IDomesticPharmaBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -27,7 +27,7 @@ public class SubType1011Handler extends AbstractEventDataHandler getEntityClass() { @@ -51,7 +51,7 @@ public class SubType1011Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, DomesticPharmaBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1012Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1012Handler.java index 9efe345..e5647a5 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1012Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1012Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IAbroadPharmaBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1012Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1012Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, AbroadPharmaBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1013Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1013Handler.java index 541bccc..2b8baae 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1013Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1013Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IPharmaceuticalProductionLicenseBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1013Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1013Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, PharmaceuticalProductionLicenseBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1014Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1014Handler.java index 3b24535..a413705 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1014Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1014Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IPharmaceuticalTradingEnterprisesService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1014Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1014Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, PharmaceuticalTradingEnterprises.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1015Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1015Handler.java index 469ed67..40dc007 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1015Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1015Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IPharmaceuticalTradingLicenseBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1015Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1015Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, PharmaceuticalTradingLicenseBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1016Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1016Handler.java index 6b7bbca..13d8e30 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1016Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1016Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IDrugDeliveryCompanyBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1016Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1016Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, DrugDeliveryCompanyBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1017Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1017Handler.java index 51ec64e..ef5d23b 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1017Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1017Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IDrugUsingUnitBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1017Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1017Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, DrugUsingUnitBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1018Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1018Handler.java index 5635848..f47c9b4 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1018Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType1018Handler.java @@ -6,7 +6,7 @@ import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.service.IDomesticDrugBaseInfoService; -import com.alihealth.d2d.provtest.service.XmlParserService; +import com.alihealth.d2d.provtest.service.impl.XmlParserServiceImpl; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +30,7 @@ public class SubType1018Handler extends AbstractEventDataHandler getEntityClass() { @@ -54,7 +54,7 @@ public class SubType1018Handler extends AbstractEventDataHandler result = xmlParserService.parseDataXml( + VTTSBasic result = xmlParserServiceImpl.parseDataXml( xml, DomesticDrugBaseInfo.class ); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java index 8f7badf..12a9363 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java @@ -1,11 +1,94 @@ package com.alihealth.d2d.provtest.service.handle.business; +import com.alihealth.d2d.provtest.domain.DomesticDrugProductionApplyInfo; +import com.alihealth.d2d.provtest.domain.DrugImportApplyInfo; +import com.alihealth.d2d.provtest.entity.EventBasic; +import com.alihealth.d2d.provtest.entity.EventBody; +import com.alihealth.d2d.provtest.entity.InstanceDetail; +import com.alihealth.d2d.provtest.entity.ItemDetail; +import com.alihealth.d2d.provtest.service.IDomesticDrugProductionApplyInfoService; +import com.alihealth.d2d.provtest.service.IDrugImportApplyInfoService; +import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; +import com.alihealth.d2d.provtest.service.handle.EventSubType; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + /** * @author Jason * @date 2025年06月05日 11:37:18 */ @Service -public class SubType2012Handler { +@EventSubType("2012") +public class SubType2012Handler extends AbstractEventDataHandler { + + @Autowired + private IDrugImportApplyInfoService service; + + @Override + protected Class getEntityClass() { + return DrugImportApplyInfo.class; + } + + @Override + protected IService getService() { + return service; + } + + @Override + protected DrugImportApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) { + EventBasic evtBasic = eventBody.getEvtBasic(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String formattedDate = LocalDate.parse( + item.getString("SCRQ"), + DateTimeFormatter.ofPattern("yyyyMMdd") + ).format(DateTimeFormatter.ISO_LOCAL_DATE); // + try { + return DrugImportApplyInfo.builder() + .eventId(eventBody.getEventID()) + .rksj(evtBasic.getDate("RKSJ")) + .recTime(formatter.parse(eventBody.getRecTime())) + .rkdbh(evtBasic.getString("RKDBH")) + .ypzsm(instance.getString("YPZSM")) + .syjbzypzsm(instance.getString("SYJBZYPZSM")) + .bzcj(instance.getString("BZCJ")) + .ymzt(instance.getString("YMZT")) + .tyshxydmjkymdlqy(instance.getString("TYSHXYDMJKYMDLQY")) + .jkymdlqymc(instance.getString("JKYMDLQYMC")) + .jwypssxkcyrdm(instance.getString("JWYPPSSXKCYRDM")) + .jwypssxkcyrmczw(instance.getString("JWYPPSSXKCYRMCZW")) + .jwypscqydm(instance.getString("JWYPPSCQYDM")) + .jwypscqymczw(instance.getString("JWYPPSCQYMCZW")) + .jwypscqymczw(instance.getString("JWYPPSCQYMCZW")) + .tyshxydmfbzc(instance.getString("TYSHXYDMFBZC")) + .fbzcmc(instance.getString("FBZCMC")) + .yptymc(instance.getString("YPTYMC")) + .gjypbsm(instance.getString("GJYPBSM")) + .ymscph(instance.getString("YMSCPH")) + .scrq(instance.getDate("SCRQ")) + .ymyxqjzrq(instance.getDate("YMYXQJZRQ")) + .scsl(instance.getInt("SCSL")) + .createTime(instance.getDate("CREATETIME")) + .updateTime(instance.getDate("UPDATETIME")) + .isDeleted(instance.getInt("ISDELETE")) + .build(); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + @Override + public String getSubType() { + return "2012"; + } + + @Override + public void handleBase(String xml, String eventId) { + + } } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/IEventProcessingService.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/EventProcessingServiceImpl.java similarity index 84% rename from src/main/java/com/alihealth/d2d/provtest/service/IEventProcessingService.java rename to src/main/java/com/alihealth/d2d/provtest/service/impl/EventProcessingServiceImpl.java index 1a0c79e..8604b9c 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/IEventProcessingService.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/impl/EventProcessingServiceImpl.java @@ -1,4 +1,4 @@ -package com.alihealth.d2d.provtest.service; +package com.alihealth.d2d.provtest.service.impl; import com.alihealth.d2d.provtest.entity.VTTSEventS; import com.alihealth.d2d.provtest.factory.EventHandlerFactory; @@ -14,9 +14,9 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class IEventProcessingService { +public class EventProcessingServiceImpl { - private final XmlParserService xmlParserService; + private final XmlParserServiceImpl xmlParserServiceImpl; private final EventHandlerFactory handlerFactory; /** @@ -31,7 +31,7 @@ public class IEventProcessingService { if(eventPojo.getSubType().startsWith("20")) {//应用数据 VTTSEventS eventS = null; try { - eventS = xmlParserService.parseAppDataXml(xml); + eventS = xmlParserServiceImpl.parseAppDataXml(xml); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/XmlParserServiceImpl.java similarity index 98% rename from src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java rename to src/main/java/com/alihealth/d2d/provtest/service/impl/XmlParserServiceImpl.java index 16c0a29..4276b68 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/impl/XmlParserServiceImpl.java @@ -1,4 +1,4 @@ -package com.alihealth.d2d.provtest.service; +package com.alihealth.d2d.provtest.service.impl; import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; import com.alihealth.d2d.provtest.entity.VTTSBasic; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * @date 2025年05月30日 11:41:26 */ @Service -public class XmlParserService { +public class XmlParserServiceImpl { protected final Logger log = LoggerFactory.getLogger(getClass()); private static final Map, JAXBContext> CONTEXT_CACHE = new ConcurrentHashMap<>();