diff --git a/src/main/java/com/glxp/api/controller/trace/TestController.java b/src/main/java/com/glxp/api/controller/trace/TestController.java index 40a935a..478462d 100644 --- a/src/main/java/com/glxp/api/controller/trace/TestController.java +++ b/src/main/java/com/glxp/api/controller/trace/TestController.java @@ -5,6 +5,8 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.config.rabbit.TopicRabbitConfig; import com.glxp.api.util.DateUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -17,13 +19,14 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; - +@Api(tags = "测试相关接口") @RestController @RequiredArgsConstructor public class TestController { @Resource private final RabbitTemplate rabbitTemplate; + @ApiOperation(value = "发送UDI码",response = BaseResponse.class) @GetMapping("/sendUdi") public BaseResponse sendUdi(String key) { String messageId = String.valueOf(UUID.randomUUID()); @@ -35,6 +38,7 @@ public class TestController { return ResultVOUtils.success("发送成功"); } + @ApiOperation(value = "发送备注",response = BaseResponse.class) @GetMapping("/sendCommon") public BaseResponse sendCommon(String key) { String messageId = String.valueOf(UUID.randomUUID()); diff --git a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java index fc99f4e..b74ea43 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java @@ -18,6 +18,8 @@ import com.glxp.api.service.trace.TraceManuCodeRelService; import com.glxp.api.service.trace.TraceManuOrderService; import com.glxp.api.service.trace.TraceTaskNoticeService; import com.glxp.api.service.trace.TraceTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; @@ -37,6 +39,7 @@ import java.util.List; * 追溯查询-生产信息相关接口 */ +@Api(tags = "追溯查询-生产信息相关接口") @ApiIgnore @RestController @Slf4j @@ -48,6 +51,7 @@ public class TraceManuOrderController { @Resource TraceTaskService traceTaskService; + @ApiOperation(value = "查询追溯单据列表",response = TraceManuOrderResponse.class) @AuthRuleAnnotation("udi/trace/manu/order/filter") @GetMapping("udi/trace/manu/order/filter") public BaseResponse filterLogs(TraceManuOrderRequest traceManuOrderRequest) { @@ -60,7 +64,7 @@ public class TraceManuOrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @ApiOperation(value = "查询追溯单据详情列表",response = TraceManuCodeRellResponse.class) @AuthRuleAnnotation("udi/trace/manu/order/relCode") @GetMapping("udi/trace/manu/order/relCode") public BaseResponse filterDetail(TraceManuDetailRequest traceManuDetailRequest) { @@ -77,6 +81,7 @@ public class TraceManuOrderController { TraceTaskNoticeService traceTaskNoticeService; //客户端生产信息上传接口 + @ApiOperation(value = "客户端生产信息上传接口",response = BaseResponse.class) @AuthRuleAnnotation("udi/trace/manu/order/upload") @PostMapping("udi/trace/manu/order/upload") public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java index cbe10ae..1c90894 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -23,6 +23,8 @@ import com.glxp.api.res.trace.TraceProductRecordResponse; import com.glxp.api.service.trace.TraceOrderService; import com.glxp.api.service.trace.TraceTaskNoticeService; import com.glxp.api.util.udi.FilterUdiUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; @@ -37,6 +39,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +@Api(tags = "追溯单据相关接口") @ApiIgnore @RestController @Slf4j @@ -45,6 +48,7 @@ public class TraceOrderController extends BaseController { @Resource TraceOrderService traceOrderService; + @ApiOperation(value = "查询追溯单据列表",response = TraceOrderResponse.class) @AuthRuleAnnotation("") @GetMapping("udi/trace/order/filter") public BaseResponse getTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) { diff --git a/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java b/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java index 2a1f2bb..139ba90 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceRecordController.java @@ -9,6 +9,8 @@ import com.glxp.api.req.trace.TraceRecordRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceRecordResponse; import com.glxp.api.service.trace.TraceRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,6 +19,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; +@Api(tags = "追溯记录相关接口") @ApiIgnore @RestController @Slf4j @@ -26,6 +29,7 @@ public class TraceRecordController extends BaseController { TraceRecordService traceRecordService; // 查询记录搜索 + @ApiOperation(value = "追溯查询记录搜索",response = TraceRecordResponse.class) @AuthRuleAnnotation("udi/trace/record/filter") @GetMapping("udi/trace/record/filter") public BaseResponse filterLogs(TraceRecordRequest traceRecordRequest) { diff --git a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java index 28eef81..64917dc 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java @@ -10,6 +10,8 @@ import com.glxp.api.req.trace.TraceTaskDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceTaskDlResponse; import com.glxp.api.service.trace.TraceTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -24,6 +26,7 @@ import java.util.List; * 追溯查询-任务列表相关接口 */ +@Api(tags = "追溯查询-任务列表相关接口") @ApiIgnore @RestController @Slf4j @@ -34,6 +37,7 @@ public class TraceTaskController { //任务列表 + @ApiOperation(value = "查询任务列表",response = TraceTaskDlResponse.class) @AuthRuleAnnotation("udi/trace/task/filter") @GetMapping("udi/trace/task/filter") public BaseResponse filterTask(TraceTaskDetailRequest traceTaskDetailRequest) { @@ -48,6 +52,7 @@ public class TraceTaskController { //客户端下载追溯任务列表执行下载任务 + @ApiOperation(value = "客户端下载追溯任务列表执行下载任务",response = TraceTaskDlResponse.class) @AuthRuleAnnotation("udi/trace/task/search") @GetMapping("udi/trace/task/search") public BaseResponse downloadTask(TraceDlTaskRequest taskRequest) { diff --git a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java index c955d86..6ccbeff 100644 --- a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java @@ -26,6 +26,8 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.trace.*; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.udi.FilterUdiUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +42,7 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; +@Api(tags = "UDI追溯相关接口") @ApiIgnore @RestController @Slf4j @@ -79,6 +82,7 @@ public class UdiTraceController extends BaseController { * @param traceRecordRequest * @return */ + @ApiOperation(value = "源头追溯查询",response = TraceOrderEntity.class) @AuthRuleAnnotation("udi/trace/source/search") @GetMapping("udi/trace/source/search") public BaseResponse createTrace(TraceRecordRequest traceRecordRequest) { @@ -178,6 +182,7 @@ public class UdiTraceController extends BaseController { * @param traceRecordRequest * @return */ + @ApiOperation(value = "现场检查查询",response = TraceOrderEntity.class) @AuthRuleAnnotation("udi/trace/scene/search") @GetMapping("udi/trace/scene/search") public BaseResponse sceneTrace(TraceRecordRequest traceRecordRequest) { @@ -272,6 +277,7 @@ public class UdiTraceController extends BaseController { * @return */ @Transactional + @ApiOperation(value = "客户端根据任务上传出入库单据",response = BaseResponse.class) @AuthRuleAnnotation("udi/trace/order/upload") @PostMapping("udi/trace/order/upload") public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) { @@ -309,6 +315,7 @@ public class UdiTraceController extends BaseController { * @return */ @Transactional + @ApiOperation(value = "客户端根据任务上传生产关联关系信息",response = BaseResponse.class) @AuthRuleAnnotation("udi/trace/manuOrder/upload") @PostMapping("udi/trace/manuOrder/upload") public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java index 927ce3a..6c2cecb 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java @@ -8,63 +8,75 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 任务结果表 */ @Data +@ApiModel("追溯单据实体") @TableName(value = "trace_order") public class TraceOrderEntity implements Serializable { + @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; /** * 单据号 */ + @ApiModelProperty(value = "单据号") @TableField(value = "billNo") private String billNo; /** * 单据时间 */ + @ApiModelProperty(value = "单据时间") @TableField(value = "billDate") private String billDate; /** * 1:入库;2:出库 */ + @ApiModelProperty(value = "1:入库;2:出库") @TableField(value = "inOutType") private Byte inOutType; /** * 单据类型 */ + @ApiModelProperty(value = "单据类型") @TableField(value = "billType") private String billType; /** * 发货企业 */ + @ApiModelProperty(value = "发货企业") @TableField(value = "fromCorp") private String fromCorp; /** * 发货企业统一社会信用号 */ + @ApiModelProperty(value = "发货企业统一社会信用号") @TableField(value = "fromCorpCreditNum") private String fromCorpCreditNum; /** * 收货企业 */ + @ApiModelProperty(value = "收货企业") @TableField(value = "toCorp") private String toCorp; /** * 收货企业统一社会信用号 */ + @ApiModelProperty(value = "收货企业统一社会信用号") @TableField(value = "toCorpCreditNum") private String toCorpCreditNum; @@ -72,18 +84,21 @@ public class TraceOrderEntity implements Serializable { /** * 使用者信息 (医疗机构实际使用者信息) */ + @ApiModelProperty(value = "使用者信息 (医疗机构实际使用者信息)") @TableField(value = "toUserInfo") private String toUserInfo; /** * 单据创建者 */ + @ApiModelProperty(value = "单据创建者") @TableField(value = "`createUser`") private Long createUser; /** * 企业信息ID外键 */ + @ApiModelProperty(value = "企业信息ID外键") @TableField(value = "companyIdFk") private Long companyIdFk; @@ -91,77 +106,90 @@ public class TraceOrderEntity implements Serializable { /** * 当前企业统一社会信用号 */ + @ApiModelProperty(value = "当前企业统一社会信用号") @TableField(value = "companyCertNum") private String companyCertNum; /** * 客户端类型 */ + @ApiModelProperty(value = "客户端类型") @TableField(value = "clientType") private Integer clientType; /** * 退货原因(退货时填写) */ + @ApiModelProperty(value = "退货原因(退货时填写)") @TableField(value = "returnReason") private String returnReason; /** * 销毁原因(销毁时填写) */ + @ApiModelProperty(value = "销毁原因(销毁时填写)") @TableField(value = "destoryReason") private String destoryReason; /** * 执行销毁人(销毁时填写) */ + @ApiModelProperty(value = "执行销毁人(销毁时填写)") @TableField(value = "excuseUser") private String excuseUser; /** * 执行销毁人证件号(销毁时填写) */ + @ApiModelProperty(value = "执行销毁人证件号(销毁时填写)") @TableField(value = "excuseCode") private String excuseCode; /** * 监督人姓名【销毁出库时填写】 */ + @ApiModelProperty(value = "监督人姓名【销毁出库时填写】") @TableField(value = "superviserUser") private String superviserUser; /** * 监督人证件号【销毁出库时填写】 */ + @ApiModelProperty(value = "监督人证件号【销毁出库时填写】") @TableField(value = "superviserCode") private String superviserCode; /** * 上传着ID */ + @ApiModelProperty(value = "上传着ID") @TableField(value = "uploadUser") private Long uploadUser; /** * 备注 */ + @ApiModelProperty(value = "备注") @TableField(value = "remark") private String remark; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") @TableField(value = "updateTime") private Date updateTime; /** * 查询产品记录号外键 */ + @ApiModelProperty(value = "查询产品记录号外键") @TableField(value = "traceProductIdFk") private Long traceProductIdFk; /** * 单据源头类型:1:起始位置(例如:生产企业) 2: 中间位置:(流通企业)3:结束位置:(例如:医疗机构使用,或一些销毁等) */ + @ApiModelProperty(value = "单据源头类型:1:起始位置(例如:生产企业) 2: 中间位置:(流通企业)3:结束位置:(例如:医疗机构使用,或一些销毁等)") @TableField(value = "sourceType") private Long sourceType; diff --git a/src/main/java/com/glxp/api/res/trace/TraceManuCodeRellResponse.java b/src/main/java/com/glxp/api/res/trace/TraceManuCodeRellResponse.java index 6066f40..2242ee5 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceManuCodeRellResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceManuCodeRellResponse.java @@ -1,87 +1,119 @@ package com.glxp.api.res.trace; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel("追溯信息单据详情响应类") public class TraceManuCodeRellResponse { - + @ApiModelProperty(value = "id") private Long id; /** * 生产订单号 */ + @ApiModelProperty(value = "生产订单号") private String billNo; /** * 订单日期 */ + @ApiModelProperty(value = "订单日期") private String billDate; /** * 产品名称 */ + @ApiModelProperty(value = "产品名称") private String cpmctymc; /** * 规格型号 */ + @ApiModelProperty(value = "规格型号") private String ggxh; /** * 产品描述 */ + @ApiModelProperty(value = "产品描述") private String cpms; /** * 注册/备案证号 */ + @ApiModelProperty(value = "注册/备案证号") private String zczbhhzbapzbh; /** * DI */ + @ApiModelProperty(value = "DI") private String nameCode; /** * 国家库UUID */ + @ApiModelProperty(value = "国家库UUID") private String uuid; /** * 医疗器械注册人 */ + @ApiModelProperty(value = "医疗器械注册人") private String ylqxzcrbarmc; /** * 生产企业 */ + @ApiModelProperty(value = "生产企业") private String manufactory; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 企业信息ID外键 */ + @ApiModelProperty(value = "企业信息ID外键") private Long companyIdFk; /** * 上传者ID */ + @ApiModelProperty(value = "上传者ID") private Long uploadUser; + @ApiModelProperty(value = "UDI码") private String code; + + @ApiModelProperty(value = "父码") private String pcode; + + @ApiModelProperty(value = "批次号") private String batchNo; + + @ApiModelProperty(value = "生产日期") private String produceDate; + + @ApiModelProperty(value = "失效日期") private String expireDate; + + @ApiModelProperty(value = "序列号") private String serialNo; + + @ApiModelProperty(value = "包装层级") private String bzcj; + + @ApiModelProperty(value = "包装状态") private String packState; } diff --git a/src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java b/src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java index dea1168..7b0fb37 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java @@ -3,108 +3,130 @@ package com.glxp.api.res.trace; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel("追溯信息单据响应类") public class TraceManuOrderResponse { - + @ApiModelProperty(value = "id") private Long id; /** * 生产订单号 */ + @ApiModelProperty(value = "生产订单号") private String billNo; /** * 订单日期 */ + @ApiModelProperty(value = "订单日期") private String billDate; /** * 产品名称 */ + @ApiModelProperty(value = "产品名称") private String cpmctymc; /** * 规格型号 */ + @ApiModelProperty(value = "规格型号") private String ggxh; /** * 产品描述 */ + @ApiModelProperty(value = "产品描述") private String cpms; /** * 注册/备案证号 */ + @ApiModelProperty(value = "注册/备案证号") private String zczbhhzbapzbh; /** * DI */ + @ApiModelProperty(value = "DI") private String nameCode; /** * 国家库UUID */ + @ApiModelProperty(value = "国家库UUID") private String uuid; /** * 医疗器械注册人 */ + @ApiModelProperty(value = "医疗器械注册人") private String ylqxzcrbarmc; /** * 生产企业 */ + @ApiModelProperty(value = "生产企业") private String manufactory; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 企业信息ID外键 */ + @ApiModelProperty(value = "企业信息ID外键") private Long companyIdFk; /** * 上传者ID */ + @ApiModelProperty(value = "上传者ID") private Long uploadUser; /** * 所属企业 */ + @ApiModelProperty(value = "所属企业") private String companyName; /** * 查询记录详情号 */ + @ApiModelProperty(value = "查询记录详情号") private String recordCode; /** * 批次号 */ + @ApiModelProperty(value = "批次号") private String batchNo; /** * 查询人 */ + @ApiModelProperty(value = "查询人") private String createUser; /** * 查询方式 */ + @ApiModelProperty(value = "查询方式") private String traceType; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java index 7d48963..f0650f8 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java @@ -1,122 +1,150 @@ package com.glxp.api.res.trace; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel("追溯单据响应类") public class TraceOrderResponse { + + @ApiModelProperty(value = "id") private Long id; /** * 单据号 */ + @ApiModelProperty(value = "单据号") private String billNo; /** * 单据时间 */ + @ApiModelProperty(value = "单据时间") private String billDate; /** * 1:入库;2:出库 */ + @ApiModelProperty(value = "1:入库;2:出库") private Integer inOutType; /** * 单据类型 */ + @ApiModelProperty(value = "单据类型") private String billType; /** * 发货企业 */ + @ApiModelProperty(value = "发货企业") private String fromCorp; /** * 发货企业统一社会信用号 */ + @ApiModelProperty(value = "发货企业统一社会信用号") private String fromCorpCreditNum; /** * 收货企业 */ + @ApiModelProperty(value = "收货企业") private String toCorp; /** * 收货企业统一社会信用号 */ + @ApiModelProperty(value = "收货企业统一社会信用号") private String toCorpCreditNum; + @ApiModelProperty(value = "使用者信息 (医疗机构实际使用者信息)") private String toUserInfo; /** * 单据创建者 */ + @ApiModelProperty(value = "单据创建者") private Long createUser; /** * 当前企业信息ID外键 */ + @ApiModelProperty(value = "当前企业信息ID外键") private Long companyIdFk; /** * 当前企业名称 */ + @ApiModelProperty(value = "当前企业名称") private String companyName; /** * 当前企业统一社会信用号 */ + @ApiModelProperty(value = "当前企业统一社会信用号") private String companyCertNum; /** * 客户端类型 */ + @ApiModelProperty(value = "客户端类型") private Integer clientType; /** * 退货原因(退货时填写) */ + @ApiModelProperty(value = "退货原因(退货时填写)") private String returnReason; /** * 销毁原因(销毁时填写) */ + @ApiModelProperty(value = "销毁原因(销毁时填写)") private String destoryReason; /** * 执行销毁人(销毁时填写) */ + @ApiModelProperty(value = "执行销毁人(销毁时填写)") private String excuseUser; /** * 执行销毁人证件号(销毁时填写) */ + @ApiModelProperty(value = "执行销毁人证件号(销毁时填写)") private String excuseCode; /** * 监督人姓名【销毁出库时填写】 */ + @ApiModelProperty(value = "监督人姓名【销毁出库时填写】") private String superviserUser; /** * 监督人证件号【销毁出库时填写】 */ + @ApiModelProperty(value = "监督人证件号【销毁出库时填写】") private String superviserCode; /** * 上传着ID */ + @ApiModelProperty(value = "上传着ID") private Long uploadUser; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; } diff --git a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java index f7757bd..48a06d3 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java @@ -1,124 +1,149 @@ package com.glxp.api.res.trace; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel("追溯记录响应类") public class TraceRecordResponse { - + @ApiModelProperty(value = "id") private Long id; /** * 查询记录号 */ + @ApiModelProperty(value = "查询记录号") private String recordCode; /** * 查询来源 */ + @ApiModelProperty(value = "查询来源") private Integer fromType; /** * 查询者 */ + @ApiModelProperty(value = "查询者") private String createUser; /** * 查询记录时间 */ + @ApiModelProperty(value = "查询记录时间") private Date createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; - + @ApiModelProperty(value = "记录号外键") private String recordIdFk; /** * 查询方案(按UDI码查询/按批次号查询) */ + @ApiModelProperty(value = "查询方案(按UDI码查询/按批次号查询)") private Integer traceType; /** * 查询方式(1:源头查询;2:现在检查查询) */ + @ApiModelProperty(value = "查询方式(1:源头查询;2:现在检查查询)") private Integer traceSource; /** * UDI码 */ + @ApiModelProperty(value = "UDI码") private String udiCode; /** * 社会信用号 */ + @ApiModelProperty(value = "社会信用号") private String creditNum; /** * 注册备案人 */ + @ApiModelProperty(value = "注册备案人") private String ylqxzcrbarmc; /** * 注册备案证号 */ + @ApiModelProperty(value = "注册备案证号") private String zczbhhzbapzbh; /** * 产品主DI标识 */ + @ApiModelProperty(value = "产品主DI标识") private String nameCode; /** * 产品通用名 */ + @ApiModelProperty(value = "产品通用名") private String cpmctymc; /** * 规格型号 */ + @ApiModelProperty(value = "规格型号") private String ggxh; /** * 生产批次号 */ + @ApiModelProperty(value = "生产批次号") private String batchNo; /** * 生产日期 */ + @ApiModelProperty(value = "生产日期") private String produceDate; /** * 失效日期 */ + @ApiModelProperty(value = "失效日期") private String expireDate; /** * 序列号 */ + @ApiModelProperty(value = "序列号") private String serialNo; /** * 发货单位 */ + @ApiModelProperty(value = "发货单位") private String fromCorp; /** * 收货单位 */ + @ApiModelProperty(value = "收货单位") private String toCorp; /** * 所属企业 */ + @ApiModelProperty(value = "所属企业") private String companyName; diff --git a/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java b/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java index 4c7e3b0..4be1f6e 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.trace; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -9,85 +11,103 @@ import java.util.List; * 客户端查询任务列表实体类 */ @Data +@ApiModel("客户端查询任务列表响应类") public class TraceTaskDlResponse { + @ApiModelProperty(value = "id") private Long id; /** * 按UDI码查询出入库信息 */ + @ApiModelProperty(value = "按UDI码查询出入库信息") private String udiCode; /** * 查询记录表ID外键 */ + @ApiModelProperty(value = "查询记录表ID外键") private Long produdctRecordIdFk; /** * 任务类型 1:关联关系;2:入库;3:出库 */ + @ApiModelProperty(value = "任务类型 1:关联关系;2:入库;3:出库") private Integer taskType; /** * 任务状态(未处理/正在处理(任务被下载)/ * 已处理(任务已提交) */ + @ApiModelProperty(value = "任务状态(未处理/正在处理(任务被下载)/已处理(任务已提交)") private Integer status; /** * DI标识列表,多级包装会有多个DI * DI标识数组,逗号隔开 */ + @ApiModelProperty(value = "DI标识列表,多级包装会有多个DI,DI标识数组,逗号隔开") private List diList; /** * 企业信息ID外键 */ + @ApiModelProperty(value = "企业信息ID外键") private Long companyIdFk; /** * 医疗器械注册人 */ + @ApiModelProperty(value = "医疗器械注册人") private String ylqxzcrbarmc; /** * 医疗器械注册人统一社会信用号 */ + @ApiModelProperty(value = "医疗器械注册人统一社会信用号") private String creditNum; /** * 产品名称 */ + @ApiModelProperty(value = "产品名称") private String cpmctymc; /** * 规格型号 */ + @ApiModelProperty(value = "规格型号") private String ggxh; /** * 批次号 */ + @ApiModelProperty(value = "批次号") private String batchNo; /** * 生成日期 */ + @ApiModelProperty(value = "生成日期") private String produceDate; /** * 失效日期 */ + @ApiModelProperty(value = "失效日期") private String expireDate; /** * 序列号 */ + @ApiModelProperty(value = "序列号") private String serialNo; /** * 任务创建时间 */ + @ApiModelProperty(value = "任务创建时间") private Date createTime; /** * 任务更新时间 */ + @ApiModelProperty(value = "任务更新时间") private Date updateTime;