From f24c30601b815f0f588cc5387fe5fa3e86eadb0f Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 8 Dec 2023 12:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0sw?= =?UTF-8?q?agger=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zlpt/company/api/domain/BmCoBank.java | 11 ++++++ .../company/api/domain/BmCompanyInfo.java | 34 +++++++++++++++++++ .../zlpt/company/api/domain/BusinessMenu.java | 7 ++++ .../zlpt/company/api/domain/BusinessOpen.java | 14 ++++++++ .../zlpt/company/api/domain/MaUpOff.java | 12 +++++++ .../company/api/domain/MaUserCollect.java | 9 +++++ .../bonus/zlpt/company/api/domain/SysDic.java | 14 ++++++++ .../company/api/domain/dto/BmCompanyDto.java | 8 +++++ .../company/api/domain/dto/FileInfoDto.java | 7 ++++ .../api/domain/dto/ServiceGreementDto.java | 8 +++++ .../company/api/domain/vo/BusinessOpenVo.java | 8 +++++ .../api/domain/vo/ServiceGreementVo.java | 8 +++++ .../bonus/zlpt/equip/api/domain/FileInfo.java | 7 ++++ .../zlpt/equip/api/domain/LeaseInfo.java | 5 +++ .../zlpt/equip/api/domain/SysFileInfo.java | 10 ++++++ .../bonus/zlpt/equip/api/domain/TypeInfo.java | 12 +++++++ .../zlpt/equip/api/domain/TypeInfoRecord.java | 9 +++++ .../bonus/zlpt/equip/api/domain/UpOff.java | 11 ++++++ .../zlpt/equip/api/domain/UserCollect.java | 6 ++++ .../equip/api/domain/dto/InforMationDto.java | 4 ++- .../zlpt/equip/api/domain/dto/UpOffDto.java | 7 ++++ .../zlpt/equip/api/domain/vo/MaDevInfoVo.java | 7 ++++ 22 files changed, 217 insertions(+), 1 deletion(-) diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCoBank.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCoBank.java index f32c6ee..ecc1925 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCoBank.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCoBank.java @@ -1,6 +1,9 @@ package com.bonus.zlpt.company.api.domain; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -14,6 +17,7 @@ import lombok.Data; * bm_co_bank企业开户行信息 */ @Data +@ApiModel("企业开户行信息") public class BmCoBank implements Serializable { private static final long serialVersionUID = 9028660704843374531L; @@ -23,36 +27,43 @@ public class BmCoBank implements Serializable { /** * 开户行 */ + @ApiModelProperty(value = "开户行", required = true) private String bankName; /** * 账户名称 */ + @ApiModelProperty(value = "账户名称", required = true) private String accountName; /** * 银行账号 */ + @ApiModelProperty(value = "银行账号", required = true) private String bankAccount; /** * 开户行所在地 */ + @ApiModelProperty(value = "开户行所在地", required = true) private String bankAddress; /** * 开户许可证核准号 */ + @ApiModelProperty(value = "开户许可证核准号", required = true) private String permitNumber; /** * 开户许可证 */ + @ApiModelProperty(value = "开户许可证", required = true) private String permitUrl; /** * 企业id */ + @ApiModelProperty(value = "企业id", required = true) private Integer coId; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java index 5503d4b..3da3a8c 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java @@ -3,6 +3,8 @@ package com.bonus.zlpt.company.api.domain; import java.io.Serializable; import com.bonus.zlpt.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -16,6 +18,7 @@ import lombok.Data; * 企业信息表 */ @Data +@ApiModel("企业信息表") public class BmCompanyInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -24,174 +27,205 @@ public class BmCompanyInfo implements Serializable { * 企业id */ @Excel(name = "企业id") + @ApiModelProperty(value = "企业id", required = true) private Integer companyId; /** * 企业名称 */ @Excel(name = "企业名称") + @ApiModelProperty(value = "企业名称", required = true) private String companyName; /** * 企业类型(社会企业，南网集团企业，南网控股企业) */ @Excel(name = "企业类型") + @ApiModelProperty(value = "企业类型", required = true) private String companyType; /** * 企业所属（广东电网、广西电网、贵州电网、云南电网、海南电网、储能公司、深圳供电局、超高压公司） */ @Excel(name = "企业所属") + @ApiModelProperty(value = "企业所属", required = true) private String companyLtd; /** * 统一社会信用代码 */ @Excel(name = "统一社会信用代码") + @ApiModelProperty(value = "统一社会信用代码", required = true) private String creditCode; /** * 注册地址 */ @Excel(name = "注册地址") + @ApiModelProperty(value = "注册地址", required = true) private String registerAddress; /** * 经营地址 */ @Excel(name = "经营地址") + @ApiModelProperty(value = "经营地址", required = true) private String operateAddress; /** * 证件类型 */ @Excel(name = "证件类型") + @ApiModelProperty(value = "证件类型", required = true) private String certificatetype; /** * 法人证件号码 */ @Excel(name = "法人证件号码") + @ApiModelProperty(value = "法人证件号码", required = true) private String idNumber; /** * 营业执照 */ @Excel(name = "营业执照") + @ApiModelProperty(value = "营业执照", required = true) private String businessLicense; /** * 法人姓名 */ @Excel(name = "法人姓名") + @ApiModelProperty(value = "法人姓名", required = true) private String legalPerson; /** * 邀请码 */ @Excel(name = "邀请码") + @ApiModelProperty(value = "邀请码", required = true) private String invitationCode; /** * 邀请企业名称 */ @Excel(name = "邀请企业名称") + @ApiModelProperty(value = "邀请企业名称", required = true) private String invitationCoName; /** * 经营范围 */ @Excel(name = "经营范围") + @ApiModelProperty(value = "经营范围", required = true) private String businessScope; /** * 被授权人姓名 */ @Excel(name = "被授权人姓名") + @ApiModelProperty(value = "被授权人姓名", required = true) private String authPerson; /** * 被授权人身份证 */ @Excel(name = "被授权人身份证") + @ApiModelProperty(value = "被授权人身份证", required = true) private String authIdNumber; /** * 被授权人手机号 */ @Excel(name = "被授权人手机号") + @ApiModelProperty(value = "被授权人手机号", required = true) private String authPhone; /** * 法人授权书 */ @Excel(name = "法人授权书") + @ApiModelProperty(value = "法人授权书", required = true) private String authDocument; /** * 被授权人身份证头像面 */ @Excel(name = "被授权人身份证头像面") + @ApiModelProperty(value = "被授权人身份证头像面", required = true) private String idFaceUrl; /** * 被授权人身份证国徽面 */ @Excel(name = "被授权人身份证国徽面") + @ApiModelProperty(value = "被授权人身份证国徽面", required = true) private String idNationUrl; /** * 被授权人邮箱 */ @Excel(name = "被授权人邮箱") + @ApiModelProperty(value = "被授权人邮箱", required = true) private String authEmail; /** * 创建时间 */ @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间", required = true) private String createTime; /** * 创建人 */ @Excel(name = "创建人") + @ApiModelProperty(value = "创建人", required = true) private Integer creator; /** * 审核人 */ @Excel(name = "审核人") + @ApiModelProperty(value = "审核人", required = true) private Integer auditor; /** * 审核时间 */ @Excel(name = "审核时间") + @ApiModelProperty(value = "审核时间", required = true) private String auditTime; /** * 审核备注 */ @Excel(name = "审核备注") + @ApiModelProperty(value = "审核备注", required = true) private String auditRemark; /** * 状态（0待审核，1通过，2驳回） */ @Excel(name = "状态（0待审核，1通过，2驳回）") + @ApiModelProperty(value = "状态（0待审核，1通过，2驳回）", required = true) private String status; @Excel(name = "公司logo") + @ApiModelProperty(value = "公司logo", required = true) private String logoUrl; @Excel(name = "修改时间") + @ApiModelProperty(value = "修改时间", required = true) private String updateTime; @Excel(name = "法人身份证头像面") + @ApiModelProperty(value = "法人身份证头像面", required = true) private String legalFaceUrl; @Excel(name = "法人身份证国徽面") + @ApiModelProperty(value = "法人身份证国徽面", required = true) private String legalNationUrl; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessMenu.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessMenu.java index 3926128..3ba47bb 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessMenu.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessMenu.java @@ -1,25 +1,32 @@ package com.bonus.zlpt.company.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 业务菜单 */ @Data +@ApiModel("业务菜单") public class BusinessMenu { @Excel(name = "id") + @ApiModelProperty(value = "id", required = true) private Integer id; @Excel(name = "业务名称") + @ApiModelProperty(value = "业务名称", required = true) private String name; @Excel(name = "业务类型") + @ApiModelProperty(value = "业务类型", required = true) private String type; @Excel(name = "是否删除") + @ApiModelProperty(value = "是否删除", required = true) private String isActive; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessOpen.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessOpen.java index beb470e..342c2e6 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessOpen.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessOpen.java @@ -1,45 +1,59 @@ package com.bonus.zlpt.company.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 业务开通管理 */ @Data +@ApiModel("业务开通管理") public class BusinessOpen { @Excel(name = "id") + @ApiModelProperty(value = "id", required = true) private Integer id; @Excel(name = "用户id") + @ApiModelProperty(value = "用户id", required = true) private Integer userId; @Excel(name = "企业ID") + @ApiModelProperty(value = "企业ID", required = true) private Integer coId; @Excel(name = "业务id") + @ApiModelProperty(value = "业务id", required = true) private Integer businessId; @Excel(name = "开通申请日期") + @ApiModelProperty(value = "开通申请日期", required = true) private String time; @Excel(name = "附件名称") + @ApiModelProperty(value = "附件名称", required = true) private String fileName; @Excel(name = "附件地址") + @ApiModelProperty(value = "附件地址", required = true) private String fileUrl; @Excel(name = "审核人") + @ApiModelProperty(value = "审核人", required = true) private String auditor; @Excel(name = "审核日期") + @ApiModelProperty(value = "审核日期", required = true) private String auditTime; @Excel(name = "状态（0待审核，1通过，2驳回）") + @ApiModelProperty(value = "状态（0待审核，1通过，2驳回）", required = true) private String status; @Excel(name = "审核备注 ") + @ApiModelProperty(value = "审核备注", required = true) private String auditRemark; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUpOff.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUpOff.java index 37e111b..745c27c 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUpOff.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUpOff.java @@ -1,6 +1,9 @@ package com.bonus.zlpt.company.api.domain; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,6 +14,7 @@ import lombok.Data; */ @Data +@ApiModel("设备上下架管理") public class MaUpOff implements Serializable { private static final long serialVersionUID = -734284532786259297L; @@ -20,41 +24,49 @@ public class MaUpOff implements Serializable { /** * 设备id */ + @ApiModelProperty(value = "设备id", required = true) private Integer maId; /** * 申请时间 */ + @ApiModelProperty(value = "申请时间", required = true) private String applyTime; /** * 申请人 */ + @ApiModelProperty(value = "申请人", required = true) private String applyUser; /** * 申请企业 */ + @ApiModelProperty(value = "申请企业", required = true) private String applyCompany; /** * 1上架，2下架 */ + @ApiModelProperty(value = "1上架，2下架", required = true) private String type; /** * 审核人 */ + @ApiModelProperty(value = "审核人", required = true) private String auditUser; /** * 审核时间 */ + @ApiModelProperty(value = "审核时间", required = true) private String auditTime; /** * 状态（1通过，2驳回） */ + @ApiModelProperty(value = "状态（1通过，2驳回）", required = true) private String status; } \ No newline at end of file diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUserCollect.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUserCollect.java index b6deb92..3f0b66b 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUserCollect.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUserCollect.java @@ -1,6 +1,9 @@ package com.bonus.zlpt.company.api.domain; import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,6 +14,7 @@ import lombok.Data; */ @Data +@ApiModel("我的收藏表") public class MaUserCollect implements Serializable { private static final long serialVersionUID = -8259045797259132976L; @@ -20,26 +24,31 @@ public class MaUserCollect implements Serializable { /** * 用户id */ + @ApiModelProperty(value = "用户id", required = true) private Integer userId; /** * 用户名 */ + @ApiModelProperty(value = "用户名", required = true) private String userName; /** * 设备id */ + @ApiModelProperty(value = "设备id", required = true) private Integer maId; /** * 设备名称 */ + @ApiModelProperty(value = "设备名称", required = true) private String maName; /** * 收藏时间 */ + @ApiModelProperty(value = "收藏时间", required = true) private String time; } \ No newline at end of file diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java index 6fe078a..85b903e 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java @@ -4,6 +4,8 @@ import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; import com.bonus.zlpt.common.core.web.page.PageDomain; import com.fasterxml.jackson.databind.ser.Serializers; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +14,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel("数据字典（企业类型管理）") public class SysDic extends PageDomain { private static final long serialVersionUID = 1L; @@ -20,36 +23,47 @@ public class SysDic extends PageDomain { private PageDomain pageDomain; @Excel(name = "id") + @ApiModelProperty(value = "id", required = true) private Integer id; @Excel(name = "父id") + @ApiModelProperty(value = "父id", required = true) private Integer pId; @Excel(name = "编码") + @ApiModelProperty(value = "编码", required = true) private String code; @Excel(name = "字典名称") + @ApiModelProperty(value = "字典名称", required = true) private String name; @Excel(name = "描述") + @ApiModelProperty(value = "描述", required = true) private String description; @Excel(name = "值") + @ApiModelProperty(value = "值", required = true) private String value; @Excel(name = "排序") + @ApiModelProperty(value = "排序", required = true) private String sort; @Excel(name = "层级") + @ApiModelProperty(value = "层级", required = true) private String level; @Excel(name = "状态") + @ApiModelProperty(value = "状态", required = true) private String status; @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间", required = true) private String createTime; @Excel(name = "创建人") + @ApiModelProperty(value = "创建人", required = true) private String creator; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java index e2b4898..86df909 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java @@ -1,35 +1,43 @@ package com.bonus.zlpt.company.api.domain.dto; import com.bonus.zlpt.common.core.web.page.PageDomain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data +@ApiModel("企业对象入参") public class BmCompanyDto extends PageDomain { /** * 企业名称 */ + @ApiModelProperty(value = "企业名称", required = true) private String companyName; /** * 统一社会信用代码 */ + @ApiModelProperty(value = "统一社会信用代码", required = true) private String creditCode; /** * 用户名 */ + @ApiModelProperty(value = "用户名", required = true) private String userName; /** * 开始时间 */ + @ApiModelProperty(value = "开始时间", required = true) private String beginTime; /** * 结束时间 */ + @ApiModelProperty(value = "结束时间", required = true) private String endTime; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java index 3553c40..71d48c3 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java @@ -1,22 +1,29 @@ package com.bonus.zlpt.company.api.domain.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 附件表入参 */ @Data +@ApiModel("附件表入参") public class FileInfoDto { //模块id + @ApiModelProperty(value = "模块id", required = true) private Integer modelId; //文件路径 + @ApiModelProperty(value = "文件路径", required = true) private String fileUrl; //创建人 + @ApiModelProperty(value = "创建人", required = true) private String creator; //创建时间 + @ApiModelProperty(value = "创建时间", required = true) private String createTime; } diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java index c583f9e..f834ce4 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java @@ -1,5 +1,7 @@ package com.bonus.zlpt.company.api.domain.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -8,20 +10,26 @@ import java.util.Date; * 隐私协议入参 */ @Data +@ApiModel("隐私协议入参") public class ServiceGreementDto { //协议id + @ApiModelProperty(value = "协议id", required = true) private Integer serviceId; //隐私协议名称 + @ApiModelProperty(value = "隐私协议名称", required = true) private String serviceName; //创建时间 + @ApiModelProperty(value = "创建时间", required = true) private Date createTime; //创建人 + @ApiModelProperty(value = "创建人", required = true) private Integer userId; //协议状态(0 启用, 1 停用) + @ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true) private String status; } diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BusinessOpenVo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BusinessOpenVo.java index 3d3def4..6cf347c 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BusinessOpenVo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BusinessOpenVo.java @@ -2,32 +2,40 @@ package com.bonus.zlpt.company.api.domain.vo; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.company.api.domain.BusinessOpen; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data +@ApiModel("企业对象返回类") public class BusinessOpenVo extends BusinessOpen { //企业名称 @Excel(name = "企业名称") + @ApiModelProperty(value = "企业名称", required = true) private String companyName; //业务类型 @Excel(name = "业务类型") + @ApiModelProperty(value = "业务类型", required = true) private String businessType; //用户名 @Excel(name = "用户名") + @ApiModelProperty(value = "用户名", required = true) private String nickName; //用户账号 @Excel(name = "用户账号") + @ApiModelProperty(value = "用户账号", required = true) private String userName; //统一社会信用代码 @Excel(name = "统一社会信用代码") + @ApiModelProperty(value = "统一社会信用代码", required = true) private String creditCode; } diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java index 6164649..b217170 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java @@ -1,31 +1,39 @@ package com.bonus.zlpt.company.api.domain.vo; import com.bonus.zlpt.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel("隐私协议返回vo") @SuppressWarnings("all") public class ServiceGreementVo { //协议id @Excel(name = "协议id") + @ApiModelProperty(value = "协议id", required = true) private Integer serviceId; //隐私协议名称 @Excel(name = "隐私协议名称") + @ApiModelProperty(value = "隐私协议名称", required = true) private String serviceName; //创建时间 @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间", required = true) private Date createTime; //协议状态(0 启用, 1 停用) @Excel(name = "协议状态(0 启用, 1 停用)") + @ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true) private String status; //文件路径 @Excel(name = "文件路径") + @ApiModelProperty(value = "文件路径", required = true) private String fileUrl; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/FileInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/FileInfo.java index 6752f4a..3d925e4 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/FileInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/FileInfo.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -14,6 +16,7 @@ import lombok.ToString; */ @Data @ToString +@ApiModel("设备附件") public class FileInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -23,17 +26,21 @@ public class FileInfo extends BaseEntity /** 设备id */ @Excel(name = "设备id") + @ApiModelProperty(value = "设备id", required = true) private Long maId; /** 文件名称 */ @Excel(name = "文件名称") + @ApiModelProperty(value = "文件名称", required = true) private String fileName; /** 文件路径 */ @Excel(name = "文件路径") + @ApiModelProperty(value = "文件路径", required = true) private String fileUrl; /** 0检测信息，1保险信息，3设备照片 */ @Excel(name = "0检测信息，1保险信息，3设备照片") + @ApiModelProperty(value = "0检测信息，1保险信息，3设备照片", required = true) private String type; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/LeaseInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/LeaseInfo.java index f5b70ce..2a5580b 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/LeaseInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/LeaseInfo.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -13,6 +15,7 @@ import lombok.ToString; */ @Data @ToString +@ApiModel("租赁信息对象") public class LeaseInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,10 +25,12 @@ public class LeaseInfo extends BaseEntity /** 出租信息 */ @Excel(name = "出租信息") + @ApiModelProperty(value = "出租信息", required = true) private Long czNum; /** 求租信息 */ @Excel(name = "求租信息") + @ApiModelProperty(value = "求租信息", required = true) private Long qzNum; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/SysFileInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/SysFileInfo.java index 009e10b..2e06ab4 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/SysFileInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/SysFileInfo.java @@ -1,35 +1,45 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data +@ApiModel("附件表") public class SysFileInfo { @Excel(name = "id") + @ApiModelProperty(value = "id", required = true) private Integer id; @Excel(name = "设备id") + @ApiModelProperty(value = "设备id", required = true) private Integer modelId; @Excel(name = "文件名称") + @ApiModelProperty(value = "文件名称", required = true) private String fileName; @Excel(name = "文件路径") + @ApiModelProperty(value = "文件路径", required = true) private String fileUrl; @Excel(name = "字典id") + @ApiModelProperty(value = "字典id", required = true) private Integer dicId; @Excel(name = "创建人") + @ApiModelProperty(value = "创建人", required = true) private String creator; @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间", required = true) private String createTime; diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java index 09519ce..4c796d4 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -16,42 +18,52 @@ import java.util.List; */ @Data @ToString +@ApiModel("设备类型对象") public class TypeInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** 类型id */ @Excel(name = "类型id") + @ApiModelProperty(value = "类型id", required = true) private Long typeId; /** 父级id */ @Excel(name = "父级id") + @ApiModelProperty(value = "父级id", required = true) private Long parentId; /** 类型名称 */ @Excel(name = "类型名称") + @ApiModelProperty(value = "类型名称", required = true) private String typeName; /** 计量单位 */ @Excel(name = "计量单位") + @ApiModelProperty(value = "计量单位", required = true) private String unitName; /** 层级 */ @Excel(name = "层级") + @ApiModelProperty(value = "层级", required = true) private String level; /** 排序 */ @Excel(name = "排序") + @ApiModelProperty(value = "排序", required = true) private String sort; /** 是否删除 */ @Excel(name = "是否删除") + @ApiModelProperty(value = "是否删除", required = true) private String isActive; /** 父部门名称 */ + @ApiModelProperty(value = "父部门名称", required = true) private String parentName; /** 子部门 */ + @ApiModelProperty(value = "子部门", required = true) private List children = new ArrayList(); } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfoRecord.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfoRecord.java index 4ff50a5..2371b17 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfoRecord.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfoRecord.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -13,32 +15,39 @@ import lombok.ToString; */ @Data @ToString +@ApiModel("设备类型对象") public class TypeInfoRecord extends BaseEntity { private static final long serialVersionUID = 1L; /** 类型id */ @Excel(name = "类型id") + @ApiModelProperty(value = "类型id", required = true) private Long typeId; /** 父级id */ @Excel(name = "父级id") + @ApiModelProperty(value = "父级id", required = true) private Long parentId; /** 类型名称 */ @Excel(name = "类型名称") + @ApiModelProperty(value = "类型名称", required = true) private String typeName; /** 层级 */ @Excel(name = "层级") + @ApiModelProperty(value = "层级", required = true) private String level; /** 排序 */ @Excel(name = "排序") + @ApiModelProperty(value = "排序", required = true) private String sort; /** 是否删除 */ @Excel(name = "是否删除") + @ApiModelProperty(value = "是否删除", required = true) private String isActive; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java index b39ec50..bfeafa5 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -14,6 +16,7 @@ import lombok.ToString; */ @Data @ToString +@ApiModel("设备上下架管理") public class UpOff extends BaseEntity { private static final long serialVersionUID = 1L; @@ -23,34 +26,42 @@ public class UpOff extends BaseEntity /** 设备id */ @Excel(name = "设备id") + @ApiModelProperty(value = "设备id", required = true) private Long maId; /** 申请时间 */ @Excel(name = "申请时间") + @ApiModelProperty(value = "申请时间", required = true) private String applyTime; /** 申请人 */ @Excel(name = "申请人") + @ApiModelProperty(value = "申请人", required = true) private String applyUser; /** 申请企业 */ @Excel(name = "申请企业") + @ApiModelProperty(value = "申请企业", required = true) private String applyCompany; /** 1上架，2下架 */ @Excel(name = "1上架，2下架") + @ApiModelProperty(value = "1上架，2下架", required = true) private String type; /** 审核人 */ @Excel(name = "审核人") + @ApiModelProperty(value = "审核人", required = true) private String auditUser; /** 审核时间 */ @Excel(name = "审核时间") + @ApiModelProperty(value = "审核时间", required = true) private String auditTime; /** 状态（1通过，2驳回） */ @Excel(name = "状态", readConverterExp = "1=通过，2驳回") + @ApiModelProperty(value = "状态（1通过，2驳回）", required = true) private String status; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UserCollect.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UserCollect.java index 8130004..c90f692 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UserCollect.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UserCollect.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -14,6 +16,7 @@ import lombok.ToString; */ @Data @ToString +@ApiModel("我的收藏") public class UserCollect extends BaseEntity { private static final long serialVersionUID = 1L; @@ -23,14 +26,17 @@ public class UserCollect extends BaseEntity /** 用户id */ @Excel(name = "用户id") + @ApiModelProperty(value = "用户id", required = true) private Long userId; /** 设备id */ @Excel(name = "设备id") + @ApiModelProperty(value = "设备id", required = true) private Long maId; /** 收藏时间 */ @Excel(name = "收藏时间") + @ApiModelProperty(value = "收藏时间", required = true) private String time; private Boolean isCollect; diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/InforMationDto.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/InforMationDto.java index 80d54c8..0486eed 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/InforMationDto.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/InforMationDto.java @@ -1,6 +1,7 @@ package com.bonus.zlpt.equip.api.domain.dto; import com.bonus.zlpt.equip.api.domain.DevInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,8 +10,9 @@ import lombok.EqualsAndHashCode; public class InforMationDto extends DevInfo { - + @ApiModelProperty(value = "经度", required = true) private String lon; + @ApiModelProperty(value = "纬度", required = true) private String lat; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/UpOffDto.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/UpOffDto.java index efd1236..373a44c 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/UpOffDto.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/UpOffDto.java @@ -1,20 +1,27 @@ package com.bonus.zlpt.equip.api.domain.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data +@ApiModel("企业上下架入参") public class UpOffDto { //系统编码 + @ApiModelProperty(value = "系统编码", required = true) private String code; //装备名称 + @ApiModelProperty(value = "装备名称", required = true) private String name; //企业名称 + @ApiModelProperty(value = "企业名称", required = true) private String companyName; //类型id 根据这个查谁的父id是这个 + @ApiModelProperty(value = "类型id", required = true) private Integer typeId; diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java index 0055acb..239f6d6 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.equip.api.domain.vo; import com.bonus.zlpt.equip.api.domain.DevInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,21 +12,27 @@ public class MaDevInfoVo extends DevInfo { //企业名称 + @ApiModelProperty(value = "企业名称", required = true) private String companyName; //装备类型 父级类型typeName + @ApiModelProperty(value = "装备类型", required = true) private String parentDevType; //类型名称 当前设备类型名称typeName + @ApiModelProperty(value = "类型名称", required = true) private String devTypeName; //装备名称 devTypeName+model_name + @ApiModelProperty(value = "装备名称", required = true) private String devName; //设备检验信息图片路径 + @ApiModelProperty(value = "设备检验信息图片路径", required = true) private String inspectImageUrl; //设备保险信息图片路径 + @ApiModelProperty(value = "设备保险信息图片路径", required = true) private String insureImageUrl;