From aaef3af05b35298000a85e9d2e3b984322e9bcb6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 22 Nov 2024 08:19:39 +0800 Subject: [PATCH] add profile --- .../material/common/domain/BmCoBank.java | 70 ----- .../material/common/domain/BmCompanyInfo.java | 243 ------------------ .../material/common/domain/BusinessMenu.java | 33 --- .../material/common/domain/BusinessOpen.java | 61 ----- .../bonus/material/common/domain/MaUpOff.java | 72 ------ .../material/common/domain/MaUserCollect.java | 54 ---- .../common/domain/ServiceGreementInfo.java | 22 -- .../common/domain/dto/BmCompanyDto.java | 45 ---- .../common/domain/dto/BmCompanyInfoDto.java | 15 -- .../common/domain/dto/FileInfoDto.java | 31 --- .../common/domain/dto/ServiceDto.java | 11 - .../common/domain/dto/ServiceGreementDto.java | 43 ---- .../common/domain/vo/BmCompanyInfoVo.java | 15 -- .../common/domain/vo/BmCompanyVo.java | 19 -- .../common/domain/vo/BusinessOpenVo.java | 41 --- .../common/domain/vo/ServiceGreementVo.java | 49 ---- ....yml => bootstrap-material_mall_local.yml} | 6 +- .../src/main/resources/bootstrap.yml | 2 +- 18 files changed, 3 insertions(+), 829 deletions(-) delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCoBank.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCompanyInfo.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessMenu.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessOpen.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUpOff.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUserCollect.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/ServiceGreementInfo.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyDto.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyInfoDto.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/FileInfoDto.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceDto.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceGreementDto.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyInfoVo.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyVo.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BusinessOpenVo.java delete mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/ServiceGreementVo.java rename bonus-modules/bonus-material-mall/src/main/resources/{bootstrap-sgzb_bns_local.yml => bootstrap-material_mall_local.yml} (78%) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCoBank.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCoBank.java deleted file mode 100644 index 9a39781..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCoBank.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.bonus.material.common.domain; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** -* Description: -* @Author 阮世耀 -* @Create 2023/12/2 12:53 -* @Version 1.0 -*/ - -/** - * bm_co_bank企业开户行信息 - */ -@Data -@ApiModel("企业开户行信息") -public class BmCoBank implements Serializable { - - private static final long serialVersionUID = 9028660704843374531L; - - private Integer id; - - /** - * 开户行 - */ - @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; - - -} \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCompanyInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCompanyInfo.java deleted file mode 100644 index 15018f9..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BmCompanyInfo.java +++ /dev/null @@ -1,243 +0,0 @@ -package com.bonus.material.common.domain; - -import com.bonus.common.core.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** -* Description: -* @Author 阮世耀 -* @Create 2023/12/1 19:40 -* @Version 1.0 -*/ - -/** - * 企业信息表 - */ -@Data -@ApiModel("企业信息表") -public class BmCompanyInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 企业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 registerId; - - @Excel(name = "经营地址") - @ApiModelProperty(value = "经营地址", required = true) - private String operateId; - - /** - * 注册地址 - */ - @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; - - //用户名 - private String userName; - - -} \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessMenu.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessMenu.java deleted file mode 100644 index c8f346a..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessMenu.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.bonus.material.common.domain; - -import com.bonus.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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessOpen.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessOpen.java deleted file mode 100644 index c21f0a4..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/BusinessOpen.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.bonus.material.common.domain; - -import com.bonus.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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUpOff.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUpOff.java deleted file mode 100644 index fa66c95..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUpOff.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.bonus.material.common.domain; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** -* Description: 设备上下架管理 -* @Author 阮世耀 -* @Create 2023/12/3 14:38 -* @Version 1.0 -*/ - -@Data -@ApiModel("设备上下架管理") -public class MaUpOff implements Serializable { - - private static final long serialVersionUID = -734284532786259297L; - - private Integer id; - - /** - * 设备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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUserCollect.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUserCollect.java deleted file mode 100644 index 2367a25..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/MaUserCollect.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.bonus.material.common.domain; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** -* Description: 我的收藏表 -* @Author 阮世耀 -* @Create 2023/12/2 13:41 -* @Version 1.0 -*/ - -@Data -@ApiModel("我的收藏表") -public class MaUserCollect implements Serializable { - - private static final long serialVersionUID = -8259045797259132976L; - - private Integer id; - - /** - * 用户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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/ServiceGreementInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/ServiceGreementInfo.java deleted file mode 100644 index 712bd9c..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/ServiceGreementInfo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bonus.material.common.domain; - -import com.bonus.material.common.domain.dto.FileInfoDto; -import com.bonus.material.common.domain.dto.ServiceGreementDto; -import lombok.Data; - -/** - * 服务协议表(ServiceGreementInfo)表实体类 - * - * @author makejava - * @since 2023-12-04 16:32:02 - */ -@Data -@SuppressWarnings("serial") -public class ServiceGreementInfo { - - private ServiceGreementDto serviceGreementDto; - - private FileInfoDto fileInfoDto; - -} - diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyDto.java deleted file mode 100644 index 7b57bd5..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.bonus.material.common.domain.dto; - -import com.bonus.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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyInfoDto.java deleted file mode 100644 index 7c612e4..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/BmCompanyInfoDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bonus.material.common.domain.dto; - - -import com.bonus.material.common.domain.BmCoBank; -import com.bonus.material.common.domain.BmCompanyInfo; -import lombok.Data; - -@Data -public class BmCompanyInfoDto { - - - private BmCompanyInfo bmCompanyInfo; - - private BmCoBank bmCoBank; -} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/FileInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/FileInfoDto.java deleted file mode 100644 index 2cc561c..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/FileInfoDto.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.bonus.material.common.domain.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 附件表入参 - */ -@Data -@ApiModel("附件表入参") -public class FileInfoDto { - - private Integer ID; - - //模块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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceDto.java deleted file mode 100644 index 2ef400d..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.bonus.material.common.domain.dto; - -import com.bonus.common.core.web.page.PageDomain; -import lombok.Data; - -@Data -public class ServiceDto extends PageDomain { - - //是否启用 - private String status; -} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceGreementDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceGreementDto.java deleted file mode 100644 index 789fb99..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/dto/ServiceGreementDto.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.bonus.material.common.domain.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -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; - - //模版编号 - @ApiModelProperty(value = "模版编号", required = true) - private String modelCode; - - //应用模块名称 - @ApiModelProperty(value = "应用模块名称", required = true) - private String modelName; -} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyInfoVo.java deleted file mode 100644 index f9f7fee..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyInfoVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bonus.material.common.domain.vo; - -import com.bonus.material.common.domain.BmCompanyInfo; -import lombok.Data; - -@Data -public class BmCompanyInfoVo { - - //企业信息 - private BmCompanyInfo bmCompanyInfo; - - //用户数 - private Integer userCount; - -} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyVo.java deleted file mode 100644 index 61a2123..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BmCompanyVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.bonus.material.common.domain.vo; - -import com.bonus.material.common.domain.BmCoBank; -import com.bonus.material.common.domain.BmCompanyInfo; -import lombok.Data; - -import java.util.List; - -@Data -public class BmCompanyVo { - - //企业信息 - private BmCompanyInfo bmCompanyInfo; - - //企业开户行信息 - private List bmCoBank; - - -} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BusinessOpenVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BusinessOpenVo.java deleted file mode 100644 index 35dcb72..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/BusinessOpenVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.bonus.material.common.domain.vo; - -import com.bonus.common.core.annotation.Excel; -import com.bonus.material.common.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/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/ServiceGreementVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/ServiceGreementVo.java deleted file mode 100644 index d13d4ac..0000000 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/common/domain/vo/ServiceGreementVo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.bonus.material.common.domain.vo; - -import com.bonus.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 modelCode; - - //应用模块名称 - @Excel(name = "应用模块名称") - @ApiModelProperty(value = "应用模块名称", required = true) - private String modelName; - - //文件路径 - @Excel(name = "文件路径") - @ApiModelProperty(value = "文件路径", required = true) - private String fileUrl; -} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml similarity index 78% rename from bonus-modules/bonus-material-mall/src/main/resources/bootstrap-sgzb_bns_local.yml rename to bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml index 9422e3f..4ca96bf 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml @@ -9,13 +9,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - # namespace: sgzb_bns - namespace: sgzb_bns + namespace: material_mall config: # 配置中心地址 server-addr: 127.0.0.1:8848 - # namespace: sgzb_bns - namespace: sgzb_bns + namespace: material_mall # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml index 8a1b9da..5683c4f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml @@ -5,4 +5,4 @@ spring: name: bonus-material-screen profiles: # 环境配置 - active: sgzb_bns_local + active: material_mall_local