From 8e86b27ad3d21a95b2c5207919c124d3fbed5195 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Wed, 14 Jun 2023 17:18:06 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthCheckController.java | 5 + .../controller/auth/AuthUserController.java | 7 ++ .../api/controller/auth/DeptController.java | 9 ++ .../basic/UdiProductController.java | 12 +++ .../controller/basic/UdiRelController.java | 3 + .../controller/basic/UdiSyncController.java | 12 ++- .../monitor/SysOperlogController.java | 5 + .../com/glxp/api/entity/auth/AuthAdmin.java | 26 ++++- .../glxp/api/entity/auth/AuthCheckEntity.java | 13 +++ .../com/glxp/api/entity/auth/DeptEntity.java | 37 +++++++ .../api/entity/basic/ProductInfoEntity.java | 102 ++++++++++++++++++ .../api/entity/basic/UdiCompanyEntity.java | 22 ++++ .../glxp/api/entity/monitor/SysOperLog.java | 22 ++++ .../api/req/auth/AuthUserSaveRequest.java | 21 ++++ .../req/auth/FilterInvLinkDataRequest.java | 14 +++ .../req/auth/FilterInvWarehouseRequest.java | 47 ++++++++ .../api/req/basic/BasicDictSelectRequest.java | 5 + .../req/basic/BasicUdiBatchRelRequest.java | 1 + .../api/req/basic/BasicUdiProductRequest.java | 57 ++++++++++ .../api/req/basic/FilterUdiRelRequest.java | 4 +- .../req/basic/ProductInfoFilterRequest.java | 36 +++++++ .../glxp/api/req/basic/UdiCompanyRequest.java | 14 +++ .../api/req/monitor/FilterOperLogRequest.java | 14 +++ .../glxp/api/req/system/DeleteRequest.java | 14 +++ .../api/res/basic/BasicUdiRelResponse.java | 2 +- 25 files changed, 499 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java index 7736735..49efb8b 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java @@ -9,6 +9,8 @@ import com.glxp.api.util.RsaUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; +@Api(tags = "授权核验相关接口") @ApiIgnore @RestController public class AuthCheckController { @@ -27,6 +30,7 @@ public class AuthCheckController { @Resource private AuthCheckService authCheckService; + @ApiOperation(value = "权限验证索引",response = AuthCheckEntity.class) @GetMapping("/udiwms/auth/device/filter") public BaseResponse index(FilterAuthCheckRequest filterAuthCheckRequest, BindingResult bindingResult) { @@ -44,6 +48,7 @@ public class AuthCheckController { } + @ApiOperation(value = "注册",response = BaseResponse.class) @PostMapping("/udiwms/auth/device/save") public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 66e731d..11cf3a5 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -15,6 +15,8 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.service.auth.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -28,6 +30,7 @@ import java.util.*; * 管理员相关 */ +@Api(tags = "管理员相关接口") @ApiIgnore @RestController public class AuthUserController extends BaseController { @@ -39,6 +42,7 @@ public class AuthUserController extends BaseController { @Resource DeptService deptService; + @ApiOperation(value = "更新仓库",response = BaseResponse.class) @AuthRuleAnnotation("admin/auth/admin/updateInv") @PostMapping("/admin/auth/admin/updateInv") public BaseResponse updateInv(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest, @@ -63,6 +67,7 @@ public class AuthUserController extends BaseController { * * @return */ + @ApiOperation(value = "删除用户",response = BaseResponse.class) @Log(title = "用户管理", businessType = BusinessType.DELETE) @AuthRuleAnnotation("admin/auth/admin/delete") @PostMapping("/admin/auth/admin/delete") @@ -89,6 +94,7 @@ public class AuthUserController extends BaseController { * * @return */ + @ApiOperation(value = "获取医院用户列表",response = AuthAdmin.class) @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/selectNotSelectUser") public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) { @@ -123,6 +129,7 @@ public class AuthUserController extends BaseController { //仓库未关联用户列表 @AuthRuleAnnotation("") + @ApiOperation(value = "仓库未关联用户列表",response = AuthAdmin.class) @GetMapping("/admin/auth/admin/hospitalUserList") public BaseResponse getHospitalUserList() { List hospitalUserList = authAdminService.getHospitalUserList(); diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index be691aa..3282c68 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -9,6 +9,8 @@ import java.util.Map; import javax.annotation.Resource; import javax.validation.Valid; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -38,6 +40,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import springfox.documentation.annotations.ApiIgnore; +@Api(tags = "部门相关接口") @ApiIgnore @RestController public class DeptController { @@ -53,6 +56,7 @@ public class DeptController { @AuthRuleAnnotation("") + @ApiOperation(value = "获取部门列表",response = DeptEntity.class) @GetMapping("spms/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); @@ -65,6 +69,7 @@ public class DeptController { } @AuthRuleAnnotation("") + @ApiOperation(value = "获取所有部门列表",response = DeptEntity.class) @GetMapping("spms/inv/warehouse/filterAll") public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0L); @@ -75,6 +80,7 @@ public class DeptController { @AuthRuleAnnotation("") + @ApiOperation(value = "",response = DeptEntity.class) @GetMapping("spms/inv/warehouse/filterNext") public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0L); @@ -86,6 +92,7 @@ public class DeptController { @AuthRuleAnnotation("") + @ApiOperation(value = "根据用户获取部门列表",response = DeptEntity.class) @GetMapping("spms/inv/warehouse/filterByUser") public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = customerService.getUserBean(); @@ -98,6 +105,7 @@ public class DeptController { @AuthRuleAnnotation("") + @ApiOperation(value = "获取所有本地仓库",response = BaseResponse.class) @GetMapping("spms/inv/warehouse/filterAllLocInv") public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0L); @@ -127,6 +135,7 @@ public class DeptController { @AuthRuleAnnotation("") + @ApiOperation(value = "",response = DeptEntity.class) @GetMapping("spms/inv/warehouse/filterUplLocInv") public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0L); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiProductController.java b/src/main/java/com/glxp/api/controller/basic/UdiProductController.java index 666bb12..8af7daa 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiProductController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiProductController.java @@ -20,6 +20,8 @@ import com.glxp.api.res.trace.TraceManuCodeRellResponse; import com.glxp.api.service.basic.BasicUdiProductService; import com.glxp.api.service.basic.ProductInfoService; 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.web.bind.annotation.GetMapping; @@ -32,6 +34,7 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; +@Api(tags = "UDI产品相关接口") @ApiIgnore @Slf4j @RestController @@ -44,6 +47,7 @@ public class UdiProductController extends BaseController { //获取同步库UDI信息 + @ApiOperation(value = "获取同步库UDI信息",response = BasicUdiProductEntity.class) @AuthRuleAnnotation("") @ApiIgnore @GetMapping("udi/basic/dict/filter") @@ -74,6 +78,7 @@ public class UdiProductController extends BaseController { //医疗器械信息字典编辑保存 @AuthRuleAnnotation("") + @ApiOperation(value = "添加医疗器械信息字典",response = BaseResponse.class) @PostMapping("udi/basic/dict/add") public BaseResponse addDict(@RequestBody BasicDictSelectRequest basicDictSelectRequest) { @@ -95,6 +100,7 @@ public class UdiProductController extends BaseController { @AuthRuleAnnotation("") + @ApiOperation(value = "删除医疗器械信息字典",response = BaseResponse.class) @PostMapping("udi/basic/dict/delete") public BaseResponse addDict(@RequestBody DeleteRequest deleteRequest) { if (StrUtil.isEmpty(deleteRequest.getUuid())) { @@ -107,6 +113,7 @@ public class UdiProductController extends BaseController { //医疗器械信息字典编辑保存 @AuthRuleAnnotation("") + @ApiOperation(value = "添加UDI产品信息",response = BaseResponse.class) @PostMapping("udi/basic/dict/batchAdd") public BaseResponse batchAdd(@RequestBody BasicDictSelectRequest basicDictSelectRequest) { @@ -132,6 +139,7 @@ public class UdiProductController extends BaseController { } //医疗器械信息字典编辑保存 + @ApiOperation(value = "医疗器械信息字典编辑",response = BaseResponse.class) @AuthRuleAnnotation("") @PostMapping("udi/basic/dict/edit") public BaseResponse editDict(@RequestBody BasicUdiProductEntity basicUdiProductEntity) { @@ -142,6 +150,7 @@ public class UdiProductController extends BaseController { @AuthRuleAnnotation("") + @ApiOperation(value = "获取UDI医疗器械信息字典",response = BasicUdiProductEntity.class) @GetMapping("udi/basic/dict/filterylqxzcrbarmc") public BaseResponse filterylqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest) { @@ -154,6 +163,7 @@ public class UdiProductController extends BaseController { } @AuthRuleAnnotation("") + @ApiOperation(value = "根据产品名称获取UDI医疗器械信息字典",response = BasicUdiProductEntity.class) @GetMapping("udi/basic/dict/filterCpmctymc") public BaseResponse filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest) { @@ -166,6 +176,7 @@ public class UdiProductController extends BaseController { } @AuthRuleAnnotation("") + @ApiOperation(value = "根据规格型号获取UDI医疗器械信息字典",response = BasicUdiProductEntity.class) @GetMapping("udi/basic/dict/filterGgxh") public BaseResponse filterGgxh(BasicUdiProductRequest basicUdiProductRequest) { @@ -178,6 +189,7 @@ public class UdiProductController extends BaseController { } @AuthRuleAnnotation("") + @ApiOperation(value = "根据DI标识获取UDI医疗器械信息字典",response = BasicUdiProductEntity.class) @GetMapping("udi/basic/dict/filterNameCode") public BaseResponse filterNameCode(BasicUdiProductRequest basicUdiProductRequest) { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelController.java index 91cf1c9..d7e0756 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelController.java @@ -50,6 +50,7 @@ public class UdiRelController extends BaseController { //获取同步库UDI信息 @AuthRuleAnnotation("") @ApiIgnore + @ApiOperation(value = "获取同步库UDI信息",response = BasicUdiRelResponse.class) @GetMapping("udi/basic/rel/filter") public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) { String nameCode; @@ -128,6 +129,7 @@ public class UdiRelController extends BaseController { } @AuthRuleAnnotation("") + @ApiOperation(value = "注册企业删除医疗器械信息",response = BaseResponse.class) @PostMapping("udi/basic/rel/delete") public BaseResponse deletRel(@RequestBody DeleteRequest deleteRequest) { basicUdiRelService.removeById(deleteRequest.getId()); @@ -136,6 +138,7 @@ public class UdiRelController extends BaseController { //产品信息关联修改 @AuthRuleAnnotation("") + @ApiOperation(value = "注册企更新除医疗器械信息",response = BaseResponse.class) @PostMapping("udi/basic/rel/update") public BaseResponse updateRel(@RequestBody BasicUdiRelRequest basicUdiRelRequest) { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 1119c63..f193957 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -15,6 +15,8 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicUdiRelResponse; import com.glxp.api.service.basic.*; 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.web.bind.annotation.GetMapping; @@ -24,6 +26,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; +@Api(tags = "UDI同步相关接口") @Slf4j @RestController public class UdiSyncController { @@ -41,6 +44,7 @@ public class UdiSyncController { //获取同步库UDI信息 @ApiIgnore @AuthRuleAnnotation("") + @ApiOperation(value = "获取同步库UDI信息",response = ProductInfoEntity.class) @GetMapping("udiwms/udiinfo/filterUdi") public BaseResponse filterUdi(FilterUdiRelRequest filterUdiRelRequest) { String nameCode; @@ -73,6 +77,7 @@ public class UdiSyncController { //获取同步库UDI信息 @ApiIgnore @AuthRuleAnnotation("") + @ApiOperation(value = "获取同步库UDI字典信息",response = ProductInfoEntity.class) @GetMapping("udiwms/udiinfo/dict/filter") public BaseResponse filterDict(FilterUdiRelRequest filterUdiRelRequest) { String nameCode; @@ -119,7 +124,8 @@ public class UdiSyncController { //获取同步库UDI信息 @ApiIgnore - @AuthRuleAnnotation("") + @AuthRuleAnnotation("获取同步库UDI关联信息") + @ApiOperation(value = "",response = ProductInfoEntity.class) @GetMapping("udiwms/udiinfo/rel/filter") public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) { String nameCode; @@ -167,6 +173,7 @@ public class UdiSyncController { //获取同步库医疗器械注册人信息 @ApiIgnore @AuthRuleAnnotation("") + @ApiOperation(value = "获取同步库医疗器械注册人信息",response = UdiCompanyEntity.class) @GetMapping("udiwms/udiinfo/filterCompany") public BaseResponse filterCompany(UdiCompanyRequest udiCompanyRequest) { @@ -183,6 +190,7 @@ public class UdiSyncController { //出入库同步下载 + @ApiOperation(value = "出入库同步下载(同步UDI)",response = ProductInfoEntity.class) @GetMapping("udidl/udiwms/syncUdi") public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) { @@ -191,6 +199,7 @@ public class UdiSyncController { } //出入库同步下载 + @ApiOperation(value = "出入库同步下载(同步企业)",response = UdiCompanyEntity.class) @GetMapping("udidl/udiwms/syncCompany") public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) { @@ -203,6 +212,7 @@ public class UdiSyncController { */ @ApiIgnore @AuthRuleAnnotation("") + @ApiOperation(value = "耗材字典信息获取同一产品对应DI信息",response = ProductInfoEntity.class) @GetMapping("udiwms/udiinfo/local/filterByUuid") public BaseResponse filterLocalByUuid(FilterUdiRelRequest filterUdiRelRequest) { diff --git a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java index a7b7951..51f60a6 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java @@ -11,6 +11,8 @@ import com.glxp.api.entity.monitor.SysOperLog; import com.glxp.api.req.monitor.FilterOperLogRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.monitor.ISysOperLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -21,6 +23,7 @@ import java.util.List; /** * 操作日志记录 */ +@Api(tags = "操作日志记录相关接口") @ApiIgnore @Validated @RequiredArgsConstructor @@ -33,6 +36,7 @@ public class SysOperlogController extends BaseController { /** * 获取操作日志记录列表 */ + @ApiOperation(value = "获取操作日志记录列表",response = SysOperLog.class) @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public BaseResponse list(FilterOperLogRequest filterOperLogRequest) { @@ -52,6 +56,7 @@ public class SysOperlogController extends BaseController { * * @param operIds 日志ids */ + @ApiOperation(value = "批量删除操作日志记录",response = BaseResponse.class) @Log(title = "操作日志", businessType = BusinessType.DELETE) @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") diff --git a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index e9bec27..24dc8fd 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -3,55 +3,79 @@ package com.glxp.api.entity.auth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.Constant; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; +@ApiModel("授权用户实体") @Data @TableName("auth_user") public class AuthAdmin { // 主键 + @ApiModelProperty(value = "id") private Long id; // 昵称 + @ApiModelProperty(value = "昵称") @TableField("userName") private String userName; // 登录密码 + @ApiModelProperty(value = "登录密码") @TableField("passWord") private String passWord; // 最后登录ip + @ApiModelProperty(value = "最后登录ip") @TableField("lastLoginIp") private String lastLoginIp; // 最后登录时间 + @ApiModelProperty(value = "最后登录时间") @TableField("lastLoginTime") private Date lastLoginTime; // 创建时间 + @ApiModelProperty(value = "创建时间") @TableField("createTime") private Date createTime; // 状态 + @ApiModelProperty(value = "状态") @TableField("userFlag") private Integer userFlag; + @ApiModelProperty(value = "最后修改时间") @TableField("lastModifyTime") private Date lastModifyTime; + + @ApiModelProperty(value = "备注") private String comments; + + @ApiModelProperty(value = "员工名称") @TableField("employeeName") private String employeeName; + + @ApiModelProperty(value = "客户id") @TableField("CustomerId") private Long CustomerId; + + @ApiModelProperty(value = "本地部门编码") @TableField("locDeptCode") private String locDeptCode; + + @ApiModelProperty(value = "本地仓库编码") @TableField("locInvCode") private String locInvCode; + @ApiModelProperty(value = "部门名称") @TableField(exist = false) private String deptName; - + @ApiModelProperty(value = "角色列表") @TableField(exist = false) private List roles; + + @ApiModelProperty(value = "角色ids") @TableField(exist = false) private Long[] roleIds; diff --git a/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java b/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java index 8e5701f..5d7817e 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java @@ -1,14 +1,27 @@ package com.glxp.api.entity.auth; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +@ApiModel("权限验证实体") @Data public class AuthCheckEntity { + + @ApiModelProperty(value = "id") private Integer id; + + @ApiModelProperty(value = "器械信息") private String machineInfo; + + @ApiModelProperty(value = "备注") private String remark; + + @ApiModelProperty(value = "注册码") private String registerCode; + + @ApiModelProperty(value = "创建日期") private Date createDate; } diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index ef180b7..9dc4298 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -2,36 +2,73 @@ package com.glxp.api.entity.auth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +@ApiModel("部门实体") @Data @TableName("auth_dept") public class DeptEntity { + + @ApiModelProperty(value = "id") private Long id; + + @ApiModelProperty(value = "父id") private Long pid; + + @ApiModelProperty(value = "编码") private String code; + + @ApiModelProperty(value = "名称") private String name; + + @ApiModelProperty(value = "是否寄售 1:入账库，2：预验收库，3：寄售库") private Boolean advanceType; + + @ApiModelProperty(value = "是否默认（Y是 N否）") private Boolean isDefault; + + @ApiModelProperty(value = "状态") private Integer status; + + @ApiModelProperty(value = "更新时间") private Date updateTime; + + @ApiModelProperty(value = "备注") private String remark; + + @ApiModelProperty(value = "等级") private Integer level; + + @ApiModelProperty(value = "父编码") private String pcode; + + @ApiModelProperty(value = "父名称") @TableField(exist = false) private String pName; /** * 第三方仓库ID */ + @ApiModelProperty(value = "第三方仓库ID") private String thirdId; + + @ApiModelProperty(value = "第三方仓库ID1") private String thirdId1; + + @ApiModelProperty(value = "第三方仓库ID2") private String thirdId2; + + @ApiModelProperty(value = "第三方仓库ID3") private String thirdId3; + + @ApiModelProperty(value = "第三方仓库ID4") private String thirdId4; + @ApiModelProperty(value = "是否供应商使用") private boolean spUse; } diff --git a/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java index b34a1a3..2e3ff6b 100644 --- a/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java @@ -1,74 +1,176 @@ package com.glxp.api.entity.basic; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +@ApiModel("产品信息实体") @Data public class ProductInfoEntity { + + @ApiModelProperty(value = "id") private Integer id; + + @ApiModelProperty(value = "产品标识") private String nameCode; + + @ApiModelProperty(value = "包装比例") private String packRatio; + + @ApiModelProperty(value = "包装级别") private String packLevel; + + @ApiModelProperty(value = "包含下级数量") private Integer bhxjsl; + + @ApiModelProperty(value = "包含最小销售包装数量") private Integer bhzxxsbzsl; + + @ApiModelProperty(value = "最小销售标识包含使用单元数量") private Integer zxxsbzbhsydysl; + + @ApiModelProperty(value = "包含下级产品编码") private String bhxjcpbm; + + @ApiModelProperty(value = "上级产品标识") private String sjcpbm; // + + @ApiModelProperty(value = "包装层级") private String bzcj; + + @ApiModelProperty(value = "ERPID") private String thirdProductNo; + + @ApiModelProperty(value = "ERP产品名") private String thirdProductName; + + @ApiModelProperty(value = "1.器械，2，药品") private String addType; + + @ApiModelProperty(value = "国家库key") private String deviceRecordKey; + + @ApiModelProperty(value = "以使用单元数量入库") private Integer isUseDy; + + @ApiModelProperty(value = "产品名称") private String cpmctymc; + + @ApiModelProperty(value = "产品类别") private String cplb; + + @ApiModelProperty(value = "分类编码") private String flbm; + + @ApiModelProperty(value = "规格型号") private String ggxh; + + @ApiModelProperty(value = "器械类别") private String qxlb; + + @ApiModelProperty(value = "统一社会信用代码证号") private String tyshxydm; + + @ApiModelProperty(value = "医疗器械注册备案人名称") private String ylqxzcrbarmc; + + @ApiModelProperty(value = "注册/备案证号") private String zczbhhzbapzbh; + + @ApiModelProperty(value = "注册/备案人名称英文名称") private String ylqxzcrbarywmc; + + @ApiModelProperty(value = "使用单元产品标识") private String sydycpbs; + + @ApiModelProperty(value = "uuid") private String uuid; + + @ApiModelProperty(value = "历史版本号，最高为最新") private Integer versionNumber; + + @ApiModelProperty(value = "表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识") private Integer diType; + @ApiModelProperty(value = "生产标识是否包含批号") private String scbssfbhph; + + @ApiModelProperty(value = "生产标识是否包含序列号") private String scbssfbhxlh; + + @ApiModelProperty(value = "生产标识是否包含生产日期") private String scbssfbhscrq; + + @ApiModelProperty(value = "生产标识是否包含失效日期") private String scbssfbhsxrq; + @ApiModelProperty(value = "医保编码") private String ybbm; + + @ApiModelProperty(value = "商品名称") private String spmc; + + @ApiModelProperty(value = "产品合格证编号") private String cphhhbh; + + @ApiModelProperty(value = "产品描述") private String cpms; + + @ApiModelProperty(value = "产品标识别码条形码名称") private String cpbsbmtxmc; + @ApiModelProperty(value = "批次号") private String batchNo; + + @ApiModelProperty(value = "生产日期") private String produceDate; + + @ApiModelProperty(value = "失效日期") private String expireDate; + @ApiModelProperty(value = "是否是最新记录") private Boolean isNewest; + + @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + @ApiModelProperty(value = "产品类型") private String cplx; + + @ApiModelProperty(value = "耗材或者设备") private String hchzsb; + @ApiModelProperty(value = "是否为包类产品/组套类产品； 1 是 0 否") private String sfwblztlcp; + + @ApiModelProperty(value = "共振（MR） 安全相关信息； 0 安全 ， 1 条件安全， 2不安全 ， 3 说明书或标签上面不包括 MR 安全信息") private String cgzmraqxgxx; + + @ApiModelProperty(value = "标记为一次性使用:0 否， 1 是") private String sfbjwycxsy; + + @ApiModelProperty(value = "最大重复使用次数") private String zdcfsycs; + + @ApiModelProperty(value = "是否为已灭菌产品:1 是 0 否") private String sfwwjbz; + + @ApiModelProperty(value = "使用前是否需要进行灭菌:1 是 0 否") private String syqsfxyjxmj; + + @ApiModelProperty(value = "其他信息的网址链接") private String qtxxdwzlj; + + @ApiModelProperty(value = "灭菌方式") private String mjfs; //自定义字典 + @ApiModelProperty(value = "自定义字典") private boolean check; } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java index 1a58c1d..c03a1a4 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java @@ -1,21 +1,43 @@ package com.glxp.api.entity.basic; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +@ApiModel("UDI企业实体") @Data public class UdiCompanyEntity { + @ApiModelProperty(value = "id") private int id; + + @ApiModelProperty(value = "统一社会信用代码证号") private String tyshxydm; + + @ApiModelProperty(value = "医疗器械注册备案人名称") private String ylqxzcrbarmc; + + @ApiModelProperty(value = "备案人名称英文名称") private String ylqxzcrbarywmc; + + @ApiModelProperty(value = "") private String qylxrdh; + + @ApiModelProperty(value = "") private String qylxrcz; + + @ApiModelProperty(value = "") private String qylxryx; + + @ApiModelProperty(value = "国家库key") private String deviceRecordKey; + + @ApiModelProperty(value = "更新时间") private Date updateTime; + + @ApiModelProperty(value = "产品名称") private String cpmctymc; } diff --git a/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java b/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java index 2daccd3..a2b49b0 100644 --- a/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java +++ b/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java @@ -1,5 +1,7 @@ package com.glxp.api.entity.monitor; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -10,99 +12,119 @@ import java.util.Map; * 操作日志记录表 oper_log */ +@ApiModel("操作日志记录实体") @Data public class SysOperLog { /** * 日志主键 */ + @ApiModelProperty(value = "日志主键") private Long operId; /** * 操作模块 */ + @ApiModelProperty(value = "操作模块") private String title; /** * 业务类型（0其它 1新增 2修改 3删除） */ + @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）") private Integer businessType; /** * 业务类型数组 */ + @ApiModelProperty(value = "业务类型数组") private Integer[] businessTypes; /** * 请求方法 */ + @ApiModelProperty(value = "请求方法") private String method; /** * 请求方式 */ + @ApiModelProperty(value = "请求方式") private String requestMethod; /** * 操作类别（0其它 1后台用户 2手机端用户） */ + @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）") private Integer operatorType; /** * 操作人员 */ + @ApiModelProperty(value = "操作人员") private String operName; /** * 部门名称 */ + @ApiModelProperty(value = "部门名称") private String deptName; /** * 请求url */ + @ApiModelProperty(value = "请求url") private String operUrl; /** * 操作地址 */ + @ApiModelProperty(value = "操作地址") private String operIp; /** * 操作地点 */ + @ApiModelProperty(value = "操作地点") private String operLocation; /** * 请求参数 */ + @ApiModelProperty(value = "请求参数") private String operParam; /** * 返回参数 */ + @ApiModelProperty(value = "返回参数") private String jsonResult; /** * 操作状态（0正常 1异常） */ + @ApiModelProperty(value = "操作状态（0正常 1异常）") private Integer status; /** * 错误消息 */ + @ApiModelProperty(value = "错误消息") private String errorMsg; /** * 操作时间 */ + @ApiModelProperty(value = "操作时间") private Date operTime; /** * 请求参数 */ + @ApiModelProperty(value = "请求参数") private Map params = new HashMap<>(); + @ApiModelProperty(value = "操作用户名称") private String operUserName; } diff --git a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java index cf47565..f60150b 100644 --- a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java @@ -1,5 +1,7 @@ package com.glxp.api.req.auth; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; @@ -8,32 +10,51 @@ import java.util.List; /** * 管理员的提交保存表单 */ +@ApiModel("管理员的提交保存表单请求类") @Data public class AuthUserSaveRequest { // id + @ApiModelProperty(value = "id") private Long id; // 昵称 + @ApiModelProperty(value = "昵称") private String userName; // 登录密码 + @ApiModelProperty(value = "登录密码") private String passWord; // 状态 + @ApiModelProperty(value = "状态") private Integer userFlag; + + @ApiModelProperty(value = "员工名称") private String employeeName; // 最后登录ip + @ApiModelProperty(value = "最后登录ip") private String lastLoginIp; // 最后登录时间 + @ApiModelProperty(value = "最后登录时间") private String lastLoginTime; // 创建时间 + @ApiModelProperty(value = "创建时间") private String createTime; + @ApiModelProperty(value = "最后修改时间") private String lastModifyTime; + + @ApiModelProperty(value = "备注") private String comments; // 角色ids + @ApiModelProperty(value = "角色ids") private List roles; + + @ApiModelProperty(value = "本地部门编码") private String locDeptCode; + + @ApiModelProperty(value = "本地仓库编码") private String locInvCode; + @ApiModelProperty(value = "部门列表") private List depts; } diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index 58fc197..0408e5b 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java @@ -1,19 +1,33 @@ package com.glxp.api.req.auth; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 查询仓库关联的数据请求参数 */ +@ApiModel("查询仓库关联的数据请求参数") @Data public class FilterInvLinkDataRequest extends ListPageRequest { + @ApiModelProperty(value = "编码") private String code; + + @ApiModelProperty(value = "键") private String key; + + @ApiModelProperty(value = "用户名称") private String userName; + + @ApiModelProperty(value = "员工名称") private String employeeName; + + @ApiModelProperty(value = "用户列表") private Long listUser[]; + + @ApiModelProperty(value = "父id") private String parentId; diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index 59d2454..0a307a9 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -1,36 +1,83 @@ package com.glxp.api.req.auth; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; +@ApiModel("仓库请求类") @Data public class FilterInvWarehouseRequest extends ListPageRequest { + @ApiModelProperty(value = "id") private Long id; + + @ApiModelProperty(value = "父id") private Long pid; + + @ApiModelProperty(value = "编码") private String code; + + @ApiModelProperty(value = "名称") private String name; + + @ApiModelProperty(value = "部门编码") private String deptCode; // 1:入账库，2：预验收库，3：寄售库 + @ApiModelProperty(value = "是否寄售 1:入账库，2：预验收库，3：寄售库") private Integer advanceType; + + @ApiModelProperty(value = "是否默认（Y是 N否）") private Boolean isDefault; + + @ApiModelProperty(value = "更新时间") private Date updateTime; + + @ApiModelProperty(value = "等级") private Integer level; + + @ApiModelProperty(value = "父编码") private String pcode; + + @ApiModelProperty(value = "用户id") private Long userId; + + @ApiModelProperty(value = "本地仓库编码") private String locInvCode; + + @ApiModelProperty(value = "状态") private Integer status; + + @ApiModelProperty(value = "最后更新时间") private String lastUpdateTime; + + @ApiModelProperty(value = "id列表") private List ids; + + @ApiModelProperty(value = "是否供应商使用") private Boolean spUse; + + @ApiModelProperty(value = "") private Integer filter; + + @ApiModelProperty(value = "单据类型") private int billType;//判断是否是单据类型需要的分库 + + @ApiModelProperty(value = "") private String warehouseCode; + + @ApiModelProperty(value = "上级编码") private String superiorCode;//上级 + + @ApiModelProperty(value = "下级编码") private String subordinateCode;//下级 + + @ApiModelProperty(value = "上级父编码") private String superiorPcode;//上级 + + @ApiModelProperty(value = "类型") private Integer type; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicDictSelectRequest.java b/src/main/java/com/glxp/api/req/basic/BasicDictSelectRequest.java index 2a5175e..8935f08 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicDictSelectRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicDictSelectRequest.java @@ -1,12 +1,17 @@ package com.glxp.api.req.basic; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data +@ApiModel("医疗器械信息字典绑定请求类") public class BasicDictSelectRequest { + @ApiModelProperty(value = "键") private String key; + @ApiModelProperty(value = "键列表") private List keys; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicUdiBatchRelRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUdiBatchRelRequest.java index dac599c..f2c95af 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUdiBatchRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUdiBatchRelRequest.java @@ -38,6 +38,7 @@ public class BasicUdiBatchRelRequest { /** * 更新人 */ + @ApiModelProperty(value = "更新人") private String updateUser; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicUdiProductRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUdiProductRequest.java index eeedb06..6dd7079 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUdiProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUdiProductRequest.java @@ -4,258 +4,315 @@ 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; @Data +@ApiModel("UDI医疗器械信息字典请求类") public class BasicUdiProductRequest extends ListPageRequest { + @ApiModelProperty(value = "id") private Long id; /** * 标识 */ + @ApiModelProperty(value = "标识") private String nameCode; /** * 包装比例 */ + @ApiModelProperty(value = "包装比例") private String packRatio; /** * 包装级别 */ + @ApiModelProperty(value = "包装级别") private String packLevel; /** * 包含下级数量 */ + @ApiModelProperty(value = "包含下级数量") private Integer bhxjsl; /** * 包含最小销售包装数量 */ + @ApiModelProperty(value = "包含最小销售包装数量") private Integer bhzxxsbzsl; /** * 最小包装单元内包含使用单元数量: * 最小销售标识包含使用单元数量 */ + @ApiModelProperty(value = "最小销售标识包含使用单元数量") private Integer zxxsbzbhsydysl; /** * 包含下级产品编码 */ + @ApiModelProperty(value = "包含下级产品编码") private String bhxjcpbm; /** * 包装层级 */ + @ApiModelProperty(value = "包装层级") private String bzcj; /** * ERPID */ + @ApiModelProperty(value = "ERPID") private String thirdProductNo; /** * 1.器械，2，药品 */ + @ApiModelProperty(value = "1.器械，2，药品") private Integer addType; /** * 国家库key */ + @ApiModelProperty(value = "国家库key") private String deviceRecordKey; /** * 以使用单元数量入库 */ + @ApiModelProperty(value = "以使用单元数量入库") private Integer isUseDy; /** * ERP产品名 */ + @ApiModelProperty(value = "ERP产品名") private String thirdProductName; /** * 产品名称，通用名称 */ + @ApiModelProperty(value = "产品名称，通用名称") private String cpmctymc; /** * 产品类别 */ + @ApiModelProperty(value = "产品类别") private String cplb; /** * 分类编码 */ + @ApiModelProperty(value = "分类编码") private String flbm; /** * 规格型号 */ + @ApiModelProperty(value = "规格型号") private String ggxh; /** * 器械类别 */ + @ApiModelProperty(value = "器械类别") private String qxlb; /** * 统一社会信用代码证号 */ + @ApiModelProperty(value = "统一社会信用代码证号") private String tyshxydm; /** * 注册/备案人名称 */ + @ApiModelProperty(value = "医疗器械注册备案人名称") private String ylqxzcrbarmc; /** * "注册/备案证号， */ + @ApiModelProperty(value = "注册/备案证号") private String zczbhhzbapzbh; /** * 注册/备案人名称英文名称 */ + @ApiModelProperty(value = "注册/备案人名称英文名称") private String ylqxzcrbarywmc; /** * 使用单元产品标识 */ + @ApiModelProperty(value = "使用单元产品标识") private String sydycpbs; /** * UUID主键 */ + @ApiModelProperty(value = "UUID主键") private String uuid; /** * 上级产品标识 */ + @ApiModelProperty(value = "上级产品标识") private String sjcpbm; /** * 历史版本号，最高为最新 */ + @ApiModelProperty(value = "历史版本号，最高为最新") private Integer versionNumber; /** * 表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识 */ + @ApiModelProperty(value = "表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识") private Integer diType; /** * 生产标识是否包含批号 */ + @ApiModelProperty(value = "生产标识是否包含批号") private String scbssfbhph; /** * 生产标识是否包含序列号 */ + @ApiModelProperty(value = "生产标识是否包含序列号") private String scbssfbhxlh; /** * 生产标识是否包含生产日期 */ + @ApiModelProperty(value = "生产标识是否包含生产日期") private String scbssfbhscrq; /** * 生产标识是否包含失效日期 */ + @ApiModelProperty(value = "生产标识是否包含失效日期") private String scbssfbhsxrq; /** * 医保编码 */ + @ApiModelProperty(value = "医保编码") private String ybbm; /** * 商品名称 */ + @ApiModelProperty(value = "商品名称") private String spmc; + @ApiModelProperty(value = "产品合格证编号") private String cphhhbh; + @ApiModelProperty(value = "产品描述") private String cpms; + @ApiModelProperty(value = "产品标识别码条形码名称") private String cpbsbmtxmc; /** * 是否是最新记录 */ + @ApiModelProperty(value = "是否是最新记录") private Boolean isNewest; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 产品类型 */ + @ApiModelProperty(value = "产品类型") private String cplx; /** * 耗材或者设备 */ + @ApiModelProperty(value = "耗材或者设备") private String hchzsb; /** * 是否为包类产品/组套类产品； 1 是 0 否 */ + @ApiModelProperty(value = "是否为包类产品/组套类产品； 1 是 0 否") private String sfwblztlcp; /** * 共振（MR） 安全相关信息； 0 安全 ， 1 条件安全， 28 * 不安全 ， 3 说明书或标签上面不包括 MR 安全信息 */ + @ApiModelProperty(value = "共振（MR） 安全相关信息； 0 安全 ， 1 条件安全， 2不安全 ， 3 说明书或标签上面不包括 MR 安全信息") private String cgzmraqxgxx; /** * 标记为一次性使用:0 否， 1 是 */ + @ApiModelProperty(value = "标记为一次性使用:0 否， 1 是") private String sfbjwycxsy; /** * 最大重复使用次数 */ + @ApiModelProperty(value = "最大重复使用次数") private String zdcfsycs; /** * 是否为已灭菌产品:1 是 0 否 */ + @ApiModelProperty(value = "是否为已灭菌产品:1 是 0 否") private String sfwwjbz; /** * 使用前是否需要进行灭菌:1 是 0 否 */ + @ApiModelProperty(value = "使用前是否需要进行灭菌:1 是 0 否") private String syqsfxyjxmj; /** * 灭菌方式 */ + @ApiModelProperty(value = "灭菌方式") private String mjfs; /** * 其他信息的网址链接 */ + @ApiModelProperty(value = "其他信息的网址链接") private String qtxxdwzlj; /** * 分类编码对应分类名称 */ + @ApiModelProperty(value = "分类编码对应分类名称") private String categoryName; + @ApiModelProperty(value = "制造商") private String manufactory; + @ApiModelProperty(value = "计量单位") private String measname; + @ApiModelProperty(value = "备注") private String remark; + @ApiModelProperty(value = "跟新人") private Long updateUser; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index c712e91..b3866c4 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -12,9 +12,9 @@ import java.util.List; public class FilterUdiRelRequest extends ListPageRequest { @ApiModelProperty(value = "医疗器械注册备案名称") private String ylqxzcrbarmc; - @ApiModelProperty(value = "产品名称全称") + @ApiModelProperty(value = "产品名称") private String cpmctymc; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "产品名称全称") private String entireCpmctymc; @ApiModelProperty(value = "名称编码") private String nameCode; diff --git a/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java b/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java index 5117331..12c65b0 100644 --- a/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java @@ -1,27 +1,63 @@ package com.glxp.api.req.basic; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +@ApiModel("产品信息请求类") @Data public class ProductInfoFilterRequest extends ListPageRequest { + @ApiModelProperty(value = "使用单元") private String unit; + + @ApiModelProperty(value = "企业名称") private String coName; + + @ApiModelProperty(value = "产品标识") private String nameCode; + + @ApiModelProperty(value = "1.器械，2，药品") private int addType; + + @ApiModelProperty(value = "ERPID") private String thirdProductNo; + + @ApiModelProperty(value = "国家库key") private String deviceRecordKey; + + @ApiModelProperty(value = "uuid") private String uuid; + + @ApiModelProperty(value = "产品名称") private String cpmctymc; + + @ApiModelProperty(value = "医疗器械注册备案人名称") private String ylqxzcrbarmc; + + @ApiModelProperty(value = "规格型号") private String ggxh; + + @ApiModelProperty(value = "统一社会信用代码证号") private String tyshxydm; + + @ApiModelProperty(value = "") private String authCode; + + @ApiModelProperty(value = "") private boolean isShowHis; + + @ApiModelProperty(value = "表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识") private String diType; + + @ApiModelProperty(value = "是否是最新记录") private Integer isNewest; + + @ApiModelProperty(value = "注册/备案证号") private String zczbhhzbapzbh; + + @ApiModelProperty(value = "更新时间") private String updateTime; public String toCacheKey() { diff --git a/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java index 8340b30..a6c5718 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java @@ -1,15 +1,29 @@ package com.glxp.api.req.basic; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +@ApiModel("UDI企业请求类") @Data public class UdiCompanyRequest extends ListPageRequest { + @ApiModelProperty(value = "医疗器械注册备案人名称") private String ylqxzcrbarmc; + + @ApiModelProperty(value = "统一社会信用代码证号") private String tyshxydm; + + @ApiModelProperty(value = "省份编码") private String provinceCode; + + @ApiModelProperty(value = "城市编码") private String cityCode; + + @ApiModelProperty(value = "地区编码") private String areaCode; + + @ApiModelProperty(value = "更新时间") private String updateTime; } diff --git a/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java b/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java index 85e433a..c917a54 100644 --- a/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java +++ b/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java @@ -1,31 +1,45 @@ package com.glxp.api.req.monitor; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data +@ApiModel("操作日志请求类") public class FilterOperLogRequest extends ListPageRequest { + @ApiModelProperty(value = "日志主键") private Long operId; + @ApiModelProperty(value = "操作模块") private String title; + @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）") private Integer businessType; + @ApiModelProperty(value = "请求方法") private String method; + @ApiModelProperty(value = "请求方式") private String requestMethod; + @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）") private Integer operatorType; + @ApiModelProperty(value = "操作人员") private String operName; + @ApiModelProperty(value = "部门名称") private String deptName; + @ApiModelProperty(value = "请求url") private String operUrl; + @ApiModelProperty(value = "操作地址") private String operIp; + @ApiModelProperty(value = "操作状态（0正常 1异常）") private Integer status; diff --git a/src/main/java/com/glxp/api/req/system/DeleteRequest.java b/src/main/java/com/glxp/api/req/system/DeleteRequest.java index 671417f..5fd89b0 100644 --- a/src/main/java/com/glxp/api/req/system/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/system/DeleteRequest.java @@ -1,16 +1,30 @@ package com.glxp.api.req.system; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data +@ApiModel("删除请求类") public class DeleteRequest { + @ApiModelProperty(value = "id") String id; + + @ApiModelProperty(value = "id列表") List ids; + + @ApiModelProperty(value = "单据号") String billNo; + + @ApiModelProperty(value = "单据号列表") List billNos; + + @ApiModelProperty(value = "1:同步任务，2：下载记录") Integer dlType; //1:同步任务，2：下载记录 + + @ApiModelProperty(value = "uuid") String uuid; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java index b2a1fd5..5775cb9 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java @@ -117,7 +117,7 @@ public class BasicUdiRelResponse { private String cphhhbh; @ApiModelProperty(value = "产品描述") private String cpms; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "产品标识别码条形码名称") private String cpbsbmtxmc; @ApiModelProperty(value = "批次号") private String batchNo;