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 d455312..2f11439 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java @@ -1,6 +1,8 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -21,7 +23,7 @@ import java.util.Date; @TableName("drug_delivery_note_apply_info") public class DrugDeliveryNoteApplyInfo { //主键ID - @Column(name = "id") + @TableId(value = "id", type = IdType.AUTO) private Long id; //事件流水号 @Column(name = "event_id") 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 f533025..623fb52 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugImportApplyInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 药品进口信息数据子集(DrugImportApplyInfo)表实体类 * @@ -17,82 +20,82 @@ import java.util.Date; @Builder @TableName("drug_import_apply_info") public class DrugImportApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 3214048..8e54d2d 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java @@ -1,5 +1,7 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -7,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import java.math.BigDecimal; import java.util.Date; + /** * 发货单信息数据子集(DrugInvoiceApplyInfo)表实体类 * @@ -18,196 +21,196 @@ import java.util.Date; @Builder @TableName("drug_invoice_apply_info") public class DrugInvoiceApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 BigDecimal 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 35215a2..f89bda0 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRecallApplyInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 药品召回信息数据子集(DrugRecallApplyInfo)表实体类 * @@ -17,82 +20,82 @@ import java.util.Date; @Builder @TableName("drug_recall_apply_info") public class DrugRecallApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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/DrugSelfInspectionApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java index 0b9b3b4..d47be34 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java @@ -1,5 +1,7 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -7,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import java.math.BigDecimal; import java.util.Date; + /** * 药品自检信息数据子集(DrugSelfInspectionApplyInfo)表实体类 * @@ -18,148 +21,148 @@ import java.util.Date; @Builder @TableName("drug_self_inspection_apply_info") public class DrugSelfInspectionApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 BigDecimal 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 04eedc9..89a8176 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java @@ -1,5 +1,7 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -7,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import java.math.BigDecimal; import java.util.Date; + /** * 进口药品基本信息数据子集(ImportedDrugBaseInfo)表实体类 * @@ -18,115 +21,115 @@ import java.util.Date; @Builder @TableName("imported_drug_base_info") public class ImportedDrugBaseInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 BigDecimal 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 14254ce..21033da 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/PharmaceuticalTradingEnterprisesBaseInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 药品经营企业基本信息数据子集(PharmaceuticalTradingEnterprisesBaseInfo)表实体类 * @@ -17,94 +20,94 @@ import java.util.Date; @Builder @TableName("pharmaceutical_trading_enterprises_base_info") public class PharmaceuticalTradingEnterprisesBaseInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 d74f5ec..a4c0cbd 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiptAndStorageDeviceRelTemperatureApplyInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 温度信息子集-单据与存储设备关系信息(ReceiptAndStorageDeviceRelTemperatureApplyInfo)表实体类 * @@ -17,37 +20,37 @@ import java.util.Date; @Builder @TableName("receipt_and_storage_device_rel_temperature_apply_info") public class ReceiptAndStorageDeviceRelTemperatureApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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/StorageDeviceTemperatureApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java index 52e2a38..db16027 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/StorageDeviceTemperatureApplyInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 温度信息子集-存储设备温度信息(StorageDeviceTemperatureApplyInfo)表实体类 * @@ -17,40 +20,40 @@ import java.util.Date; @Builder @TableName("storage_device_temperature_apply_info") public class StorageDeviceTemperatureApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 6115312..4a0e9ce 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/TransportTemperatureApplyInfo.java @@ -1,11 +1,14 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; import javax.persistence.Column; import java.util.Date; + /** * 温度信息子集-运输温度信息(TransportTemperatureApplyInfo)表实体类 * @@ -17,46 +20,46 @@ import java.util.Date; @Builder @TableName("transport_temperature_apply_info") public class TransportTemperatureApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 3ce92ca..47e1883 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java @@ -1,5 +1,7 @@ package com.alihealth.d2d.provtest.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -7,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import java.math.BigDecimal; import java.util.Date; + /** * 库存上报基本信息数据子集(可选)(WarehouseStockApplyInfo)表实体类 * @@ -18,100 +21,100 @@ import java.util.Date; @Builder @TableName("warehouse_stock_apply_info") public class WarehouseStockApplyInfo { -//主键ID - @Column(name = "id") + //主键ID + @TableId(value = "id", type = IdType.AUTO) 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 BigDecimal 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/entity/VTTSEventS.java b/src/main/java/com/alihealth/d2d/provtest/entity/VTTSEventS.java index 8b318ec..5720ffc 100644 --- a/src/main/java/com/alihealth/d2d/provtest/entity/VTTSEventS.java +++ b/src/main/java/com/alihealth/d2d/provtest/entity/VTTSEventS.java @@ -1,5 +1,6 @@ package com.alihealth.d2d.provtest.entity; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; @@ -8,6 +9,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; * @date 2025年06月03日 16:34:49 */ @JacksonXmlRootElement(localName = "VTTSEventS") +@JsonIgnoreProperties(ignoreUnknown = true) public class VTTSEventS { @JacksonXmlProperty(localName = "VTTSEvent") 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 92928e4..c2f2b7f 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 @@ -49,6 +49,12 @@ public abstract class AbstractEventDataHandler implements EventDataHandler { } } + } else { + try { + entities.add(convertToEntity(eventBody, null, null)); + } catch (Exception e) { + log.error("转换实体失败", e); + } } } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2051Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2051Handler.java new file mode 100644 index 0000000..bbcd311 --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2051Handler.java @@ -0,0 +1,69 @@ +package com.alihealth.d2d.provtest.service.handle.business; + +import com.alihealth.d2d.provtest.domain.ReceiptAndStorageDeviceRelTemperatureApplyInfo; +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.IReceiptAndStorageDeviceRelTemperatureApplyInfoService; +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; + +@Service +@EventSubType("2051") +public class SubType2051Handler extends AbstractEventDataHandler { + + @Autowired + private IReceiptAndStorageDeviceRelTemperatureApplyInfoService service; + + @Override + protected Class getEntityClass() { + return ReceiptAndStorageDeviceRelTemperatureApplyInfo.class; + } + + @Override + protected IService getService() { + return service; + } + + @Override + protected ReceiptAndStorageDeviceRelTemperatureApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) { + EventBasic evtBasic = eventBody.getEvtBasic(); + //时间格式 + SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //日期格式 + SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd"); + + try { + return ReceiptAndStorageDeviceRelTemperatureApplyInfo.builder() + .eventId(eventBody.getEventID()) + .recTime(formatterDatetime.parse(eventBody.getRecTime())) + + .tyshxydm(evtBasic.getString("TYSHXYDM")) + .qymc(evtBasic.getString("QYMC")) + .djh(evtBasic.getString("DJH")) + .djlx(evtBasic.getString("DJLX")) + .ccsbbh(evtBasic.getString("CCSBBH")) + + .build(); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + @Override + public String getSubType() { + return "2051"; + } + + @Override + public void handleBase(String xml, String eventId) { + + } +}