From 76c4079d9d9d084bcfc24ad09e904082410fa9ae Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 13 Jun 2023 18:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/glxp/api/entity/auth/Smenu.java | 16 +++++---
.../api/entity/sup/UserCompanyEntity.java | 17 ++++++++
.../api/entity/system/ClassifyCodeEntity.java | 10 ++++-
.../glxp/api/entity/system/CompanyEntity.java | 14 ++++++-
.../entity/trace/TraceRecordLogEntity.java | 14 ++++++-
.../req/system/FilterClassifyCodeRequest.java | 10 ++++-
.../glxp/api/req/system/LicenseRequest.java | 28 +++++++------
.../api/req/trace/TraceRecordRequest.java | 12 +++---
.../com/glxp/api/res/PageSimpleResponse.java | 5 +++
.../res/basic/BasicBussinessTypeResponse.java | 39 ++++++++++++++++++-
10 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/glxp/api/entity/auth/Smenu.java b/src/main/java/com/glxp/api/entity/auth/Smenu.java
index a51814a..00c5b1a 100644
--- a/src/main/java/com/glxp/api/entity/auth/Smenu.java
+++ b/src/main/java/com/glxp/api/entity/auth/Smenu.java
@@ -4,6 +4,8 @@ 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -11,36 +13,40 @@ import java.util.Date;
@Data
@TableName(value = "sys_menu")
public class Smenu {
+ @ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
-
+ @ApiModelProperty(value = "接口分类名称")
// 接口分类名称
@TableField(value = "name")
private String name;
-
+ @ApiModelProperty(value = "接口地址")
// 接口地址
@TableField(value = "path")
private String path;
+ @ApiModelProperty(value = "父级ID")
@TableField(value = "parentId")
private Long parentId;
-
+ @ApiModelProperty(value = "权限标识")
//权限标识
@TableField(value = "perms")
private String perms;
-
+ @ApiModelProperty(value = "接口文档地址")
// 接口文档地址
@TableField(value = "docUrl")
private String docUrl;
// 创建时间
+ @ApiModelProperty(value = "创建时间")
@TableField(value = "createTime")
private Date createTime;
-
+ @ApiModelProperty(value = "更新时间")
// 更新时间
@TableField(value = "updateTime")
private Date updateTime;
+ @ApiModelProperty(value = "备注")
@TableField(value = "remark")
private String remark;
diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java
index 21139d4..62f3723 100644
--- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java
+++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java
@@ -8,89 +8,106 @@ 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 = "user_company")
public class UserCompanyEntity implements Serializable {
+ @ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 企业名称
*/
+ @ApiModelProperty(value = "企业名称")
@TableField(value = "companyName")
private String companyName;
/**
* 统一社会信用号
*/
+ @ApiModelProperty(value = "统一社会信用号")
@TableField(value = "creditNum")
private String creditNum;
/**
* 企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构
*/
+ @ApiModelProperty(value = "企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构")
@TableField(value = "bussinessStatus")
private String bussinessStatus;
/**
* 注册时间
*/
+ @ApiModelProperty(value = "注册时间")
@TableField(value = "registerTime")
private Date registerTime;
/**
* 法人名称
*/
+ @ApiModelProperty(value = "法人名称")
@TableField(value = "legalPerson")
private String legalPerson;
/**
* 法人身份证
*/
+ @ApiModelProperty(value = "法人身份证")
@TableField(value = "legalIdCard")
private String legalIdCard;
/**
* 注册地址
*/
+ @ApiModelProperty(value = "注册地址")
@TableField(value = "registerAddress")
private String registerAddress;
/**
* 联系方式
*/
+ @ApiModelProperty(value = "联系方式")
@TableField(value = "contactWay")
private String contactWay;
/**
* 备注
*/
+ @ApiModelProperty(value = "备注")
@TableField(value = "comments")
private String comments;
/**
* 审核状态 0 未提交/3 已提交未审核/1 审核通过/2 审核未通过
*/
+ @ApiModelProperty(value = "审核状态 0 未提交/3 已提交未审核/1 审核通过/2 审核未通过")
@TableField(value = "checkStatus")
private String checkStatus;
/**
* 状态1 正常，0 禁用
*/
+ @ApiModelProperty(value = "状态1 正常，0 禁用")
@TableField(value = "`status`")
private String status;
/**
* 说明
*/
+ @ApiModelProperty(value = "说明")
@TableField(value = "`reason`")
private String reason;
/**
* 在线状态 1：在线；2：离线
*/
+ @ApiModelProperty(value = "在线状态 1：在线；2：离线")
@TableField(exist = false)
private Integer onLineStatus;
diff --git a/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java b/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java
index 38b8698..274b377 100644
--- a/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java
+++ b/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java
@@ -1,14 +1,20 @@
package com.glxp.api.entity.system;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+@ApiModel(value = "分类代码实体")
@Data
public class ClassifyCodeEntity {
-
+ @ApiModelProperty(value = "主键")
private Integer id;
+ @ApiModelProperty(value = "编码")
private String code;
+ @ApiModelProperty(value = "名称")
private String name;
+ @ApiModelProperty(value = "级别")
private String level;
+ @ApiModelProperty(value = "器械类别")
private String qxlb;
}
diff --git a/src/main/java/com/glxp/api/entity/system/CompanyEntity.java b/src/main/java/com/glxp/api/entity/system/CompanyEntity.java
index c25684b..984921c 100644
--- a/src/main/java/com/glxp/api/entity/system/CompanyEntity.java
+++ b/src/main/java/com/glxp/api/entity/system/CompanyEntity.java
@@ -1,17 +1,27 @@
package com.glxp.api.entity.system;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+@ApiModel(value = "公司实体")
@Data
public class CompanyEntity {
-
+ @ApiModelProperty(value = "企业名称")
private String name; //企业名称
+ @ApiModelProperty(value = "企业类型")
private String category; //企业类型
+ @ApiModelProperty(value = "统一社会信用代码")
private String creditCode; //统一社会信用代码
+ @ApiModelProperty(value = "住所地址")
private String addr; //住所地址
+ @ApiModelProperty(value = "生产地址")
private String productAddr; //生产地址
+ @ApiModelProperty(value = "企业类别：1.生产企业，2.流通企业，3。医疗机构")
private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构
+ @ApiModelProperty(value = "程序的唯一标识符")
private String appId;
+ @ApiModelProperty(value = "程序的密钥")
private String appSecret;
+ @ApiModelProperty(value = "审核评论")
private String auditComment;
}
diff --git a/src/main/java/com/glxp/api/entity/trace/TraceRecordLogEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceRecordLogEntity.java
index 9c37be7..34fd2e4 100644
--- a/src/main/java/com/glxp/api/entity/trace/TraceRecordLogEntity.java
+++ b/src/main/java/com/glxp/api/entity/trace/TraceRecordLogEntity.java
@@ -8,69 +8,81 @@ 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_record_log")
public class TraceRecordLogEntity implements Serializable {
-
+ @ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 查询记录流水号
*/
+ @ApiModelProperty(value = "查询记录流水号")
@TableField(value = "recordCode")
private String recordCode;
/**
* 查询来源
*/
+ @ApiModelProperty(value = "查询来源")
@TableField(value = "fromType")
private Integer fromType;
/**
* 查询者
*/
+ @ApiModelProperty(value = "查询者")
@TableField(value = "`createUser`")
private String createUser;
/**
* 查询记录时间
*/
+ @ApiModelProperty(value = "查询记录时间")
@TableField(value = "createTime")
private Date createTime;
/**
* 更新时间
*/
+ @ApiModelProperty(value = "更新时间")
@TableField(value = "updateTime")
private Date updateTime;
/**
* 备注
*/
+ @ApiModelProperty(value = "备注")
@TableField(value = "remark")
private String remark;
/**
* 查询状态 1:未处理；2.未完结；3.已完成
*/
+ @ApiModelProperty(value = "查询状态 1:未处理；2.未完结；3.已完成")
@TableField(value = "status")
private Integer status;
/**
* 查询方案（1:按UDI码查询; 2:按批次号查询）
*/
+ @ApiModelProperty(value = "查询方案（1:按UDI码查询; 2:按批次号查询）")
@TableField(value = "traceType")
private Integer traceType;
/**
* 追溯产品记录外键
*/
+ @ApiModelProperty(value = "追溯产品记录外键")
@TableField(value = "traceProductIdFk")
private Long traceProductIdFk;
diff --git a/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java b/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java
index a139ce8..ef4a1a0 100644
--- a/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java
+++ b/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java
@@ -1,18 +1,24 @@
package com.glxp.api.req.system;
import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel(value = "过滤分类编码请求")
public class FilterClassifyCodeRequest extends ListPageRequest {
-
+ @ApiModelProperty(value = "密钥")
private String key;
+ @ApiModelProperty(value = "编码")
private String code;
+ @ApiModelProperty(value = "名称")
private String name;
-
+ @ApiModelProperty(value = "输入过滤器")
private String inFilter;
+ @ApiModelProperty(value = "输入过滤器列表")
private List<String> inFilterList;
}
diff --git a/src/main/java/com/glxp/api/req/system/LicenseRequest.java b/src/main/java/com/glxp/api/req/system/LicenseRequest.java
index bf44a50..c8b310a 100644
--- a/src/main/java/com/glxp/api/req/system/LicenseRequest.java
+++ b/src/main/java/com/glxp/api/req/system/LicenseRequest.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -13,54 +15,56 @@ import java.util.Date;
* @date : 2023/5/24 11:51
* @modyified By :
*/
-
+@ApiModel(value = "许可证请求实体")
@Data
public class LicenseRequest extends ListPageRequest {
-
+ @ApiModelProperty(value = "主键")
private Long id;
// 接口分类名称
-
+ @ApiModelProperty(value = "接口分类名称")
private String name;
// 接口地址
-
+ @ApiModelProperty(value = "接口地址")
private String path;
-
+ @ApiModelProperty(value = "父级ID")
private Long parentId;
-
+ @ApiModelProperty(value = "权限标识")
//权限标识
private String perms;
-
+ @ApiModelProperty(value = "接口文档地址")
// 接口文档地址
private String docUrl;
-
+ @ApiModelProperty(value = "创建时间")
// 创建时间
private Date createTime;
-
+ @ApiModelProperty(value = "更新时间")
// 更新时间
private Date updateTime;
+ @ApiModelProperty(value = "备注")
private String remark;
/**
* 创建开始时间
*/
+ @ApiModelProperty(value = "创建开始时间")
private String startTime;
-
+ @ApiModelProperty(value = "创建结束时间")
/**
* 创建结束时间
*/
private String endTime;
-
+ @ApiModelProperty(value = "更新开始时间")
/**
* 更新开始时间
*/
private String startAduditTime;
-
+ @ApiModelProperty(value = "更新结束时间")
/**
* 跟新结束时间
*/
diff --git a/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
index 5804c13..e4439b6 100644
--- a/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
+++ b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
@@ -8,16 +8,16 @@ import lombok.Data;
import java.util.Date;
@Data
-@ApiModel("追踪记录请求")
+@ApiModel("跟踪记录请求")
public class TraceRecordRequest extends ListPageRequest {
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(hidden = true,value = "主键")
private Long id;
/**
* 查询记录号
*/
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(hidden = true,value = "查询记录号")
private String recordCode;
/**
@@ -35,18 +35,18 @@ public class TraceRecordRequest extends ListPageRequest {
/**
* 查询记录时间
*/
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(hidden = true,value = "查询记录时间")
private Date createTime;
/**
* 更新时间
*/
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(hidden = true,value = "更新时间")
private Date updateTime;
/**
* 查询方式（1:源头查询；2：现在检查查询)
*/
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(hidden = true,value = "查询方式（1:源头查询；2：现在检查查询)")
private Integer traceSource;
/**
* 查询方案（按UDI码查询/按批次号查询）
diff --git a/src/main/java/com/glxp/api/res/PageSimpleResponse.java b/src/main/java/com/glxp/api/res/PageSimpleResponse.java
index 54fe61c..e4e0e73 100644
--- a/src/main/java/com/glxp/api/res/PageSimpleResponse.java
+++ b/src/main/java/com/glxp/api/res/PageSimpleResponse.java
@@ -1,5 +1,7 @@
package com.glxp.api.res;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -8,10 +10,13 @@ import java.util.List;
* 简单的分页返回对象
*/
@Data
+@ApiModel("简单的分页返回对象")
public class PageSimpleResponse<T> {
// 总数
+ @ApiModelProperty(value = "总数")
private Integer total;
// 列表
+ @ApiModelProperty(value = "列表")
private List<T> list;
public void setTotal(Long total) {
diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
index 587d993..f5f4abc 100644
--- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
@@ -1,79 +1,116 @@
package com.glxp.api.res.basic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 单据类型响应VO
*/
@Data
+@ApiModel(value = "单据类型响应VO")
public class BasicBussinessTypeResponse {
/**
* 单据类型ID
*/
+ @ApiModelProperty(value = "单据类型ID")
private Long id;
/**
* 单据类型编码
*/
+ @ApiModelProperty(value = "单据类型ID")
private String action;
/**
* 单据类型名称
*/
+ @ApiModelProperty(value = "单据类型ID")
private String name;
/**
* 是否启用
*/
+ @ApiModelProperty(value = "单据类型ID")
private Boolean enable;
+ @ApiModelProperty(value = "单据类型ID")
private String remark;
+ @ApiModelProperty(value = "单据类型ID")
private String mainAction;
+ @ApiModelProperty(value = "单据类型ID")
private String thirdSysFk;
+ @ApiModelProperty(value = "单据类型ID")
private String thirdId;
+ @ApiModelProperty(value = "单据类型ID")
private String thirdName;
/**
* 是否根据业务单据类型校验
*/
+ @ApiModelProperty(value = "单据类型ID")
private Boolean checkEnable;
/**
* 是否预入库
+ *
*/
+ @ApiModelProperty(value = "单据类型ID")
// private Boolean advanceType;
private Boolean changeEnable;
+ @ApiModelProperty(value = "单据类型ID")
private Boolean genUnit;
+ @ApiModelProperty(value = "单据类型ID")
private String defaultUnit;
+ @ApiModelProperty(value = "单据类型ID")
private int spUse;
+ @ApiModelProperty(value = "单据类型ID")
private Boolean secCheckEnable;
+ @ApiModelProperty(value = "单据类型ID")
private int checkUdims;
+ @ApiModelProperty(value = "单据类型ID")
private int checkPdaEd;
+ @ApiModelProperty(value = "单据类型ID")
private int checkPdaUn;
+ @ApiModelProperty(value = "单据类型ID")
private int checkPc;
+ @ApiModelProperty(value = "单据类型ID")
private int checkWebNew;
+ @ApiModelProperty(value = "单据类型ID")
private int checkChange;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckUdims;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckPdaEd;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckPdaUn;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckPc;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckWebNew;
+ @ApiModelProperty(value = "单据类型ID")
private boolean secCheckChange;
+ @ApiModelProperty(value = "单据类型ID")
private int corpType;
+ @ApiModelProperty(value = "单据类型ID")
private String storageCode;
+
/**
* 补单类型
*/
+ @ApiModelProperty(value = "单据类型ID")
private String supplementOrderType;
/**
* 启用默认补单
*/
+ @ApiModelProperty(value = "单据类型ID")
private boolean enableSupplementOrder;
-
+ @ApiModelProperty(value = "单据类型ID")
private int checkBalance;
+
private boolean secCheckBalance;
private boolean useDyCount;