From 106c76f0084328293ebc4d86f6104d6d39c00f07 Mon Sep 17 00:00:00 2001 From: cengy Date: Fri, 11 Apr 2025 20:09:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ff-bean):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E6=A8=A1=E5=9E=8B=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了多个冗余的实体类文件 - 重命名 ff-mysql 为 ff-domain - 更新了相关的依赖和模块名称 --- ff-bean/{ff-mysql => ff-domain}/pom.xml | 15 +- .../agent/domain/TenantAgentCommission.java | 101 ------- .../ff/agent/domain/TenantAgentInvite.java | 83 ------ .../domain/TenantAgentInvitePlatform.java | 58 ---- .../domain/TenantAgentInviteRegister.java | 85 ------ .../agent/domain/TenantAgentWithdrawal.java | 58 ---- .../com/ff/base/core/domain/BaseEntity.java | 79 ----- .../com/ff/base/system/domain/SysConfig.java | 108 ------- .../ff/base/system/domain/SysDatasource.java | 47 --- .../com/ff/base/system/domain/SysDept.java | 208 ------------- .../ff/base/system/domain/SysDictData.java | 197 ------------- .../ff/base/system/domain/SysDictType.java | 94 ------ .../ff/base/system/domain/SysLogininfor.java | 134 --------- .../com/ff/base/system/domain/SysMenu.java | 279 ------------------ .../com/ff/base/system/domain/SysOperLog.java | 110 ------- .../com/ff/base/system/domain/SysPost.java | 121 -------- .../com/ff/base/system/domain/SysRole.java | 233 --------------- .../ff/base/system/domain/SysRoleDept.java | 51 ---- .../ff/base/system/domain/SysRoleMenu.java | 51 ---- .../com/ff/base/system/domain/SysUser.java | 152 ---------- .../ff/base/system/domain/SysUserOnline.java | 112 ------- .../ff/base/system/domain/SysUserPost.java | 45 --- .../ff/base/system/domain/SysUserRole.java | 45 --- .../ff/base/system/domain/TenantAgent.java | 83 ------ .../ff/base/system/domain/TenantPlatform.java | 58 ---- .../base/system/domain/TenantSecretKey.java | 113 ------- .../ff/base/system/domain/TenantWhite.java | 41 --- .../java/com/ff/common/domain/Currency.java | 67 ----- .../main/java/com/ff/common/domain/Lang.java | 45 --- .../ff/common/domain/TenantAgentPlatform.java | 50 ---- .../com/ff/common/domain/TenantGameQuota.java | 53 ---- .../ff/common/domain/TenantGameQuotaFlow.java | 102 ------- .../ff/common/domain/TenantQuotaExchange.java | 63 ---- .../java/com/ff/game/domain/CurrencyInfo.java | 15 - .../main/java/com/ff/game/domain/ExtInfo.java | 22 -- .../main/java/com/ff/game/domain/Game.java | 97 ------ .../ff/game/domain/GameBettingDetails.java | 183 ------------ .../com/ff/game/domain/GameExchangeMoney.java | 113 ------- .../com/ff/game/domain/GameFreeRecord.java | 106 ------- .../main/java/com/ff/game/domain/KeyInfo.java | 21 -- .../java/com/ff/game/domain/LangInfo.java | 14 - .../java/com/ff/game/domain/NameInfo.java | 26 -- .../java/com/ff/game/domain/Platform.java | 82 ----- .../java/com/ff/game/domain/PlatformInfo.java | 15 - .../main/java/com/ff/game/domain/UrlInfo.java | 20 -- .../java/com/ff/member/domain/Member.java | 56 ---- .../java/com/ff/sys/domain/SysFeedback.java | 60 ---- .../java/com/ff/sys/domain/SysNotice.java | 32 -- ff-game/pom.xml | 2 +- pom.xml | 4 +- 50 files changed, 7 insertions(+), 4002 deletions(-) rename ff-bean/{ff-mysql => ff-domain}/pom.xml (84%) delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java delete mode 100644 ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java diff --git a/ff-bean/ff-mysql/pom.xml b/ff-bean/ff-domain/pom.xml similarity index 84% rename from ff-bean/ff-mysql/pom.xml rename to ff-bean/ff-domain/pom.xml index 671fc56..7295cd2 100644 --- a/ff-bean/ff-mysql/pom.xml +++ b/ff-bean/ff-domain/pom.xml @@ -8,27 +8,20 @@ 0.0.1 - ff-mysql-entity + ff-domain 0.0.1 - ff-mysql-entity + ff-domain jar - - com.xuxueli - xxl-job-core - + org.projectlombok lombok provided - - com.dtflys.forest - forest-spring-boot-starter - org.springframework.boot @@ -79,7 +72,7 @@ - ff-mysql-entity + ff-domain diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java deleted file mode 100644 index a215e3d..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.ff.agent.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 代理佣金管理 对象 ff_tenant_agent_commission - * - * @author shi - * @date 2025-02-26 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentCommission extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * $column.columnComment - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 代理id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long agentId; - - /** - * 来源id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long sourceId; - - /** - * 来源类型 CommissionSourceType - */ - private Integer sourceType; - - /** - * 佣金类型 ff_tenant_agent_commission_type commissionType - */ - private Integer commissionType; - - /** - * 币种 - */ - private String currencyCode; - - /** - * 平台代码 - */ - private String platformCode; - - /** - * 成本比例 - */ - private BigDecimal costBalance; - - /** - * 商户比例 - */ - private BigDecimal merchantBalance; - - /** - * 充值金额 - */ - private BigDecimal balance; - - /** - * 佣金金额 - */ - private BigDecimal commissionBalance; - - /** - * USDT金额 - */ - private BigDecimal usdtBalance; - - /** - * 佣金审批状态 ff_tenant_agent_approval_status 0 未提现 1 提现中 1 已提现 - */ - private Integer approvalStatus; - - - /** - * 代理提款id - */ - private Long agentWithdrawalId; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java deleted file mode 100644 index 10c7934..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.ff.agent.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 代理邀请链接对象 ff_tenant_agent_invite - * - * @author shi - * @date 2025-02-25 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentInvite extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 代理id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long agentId; - - /** - * 缴费金额 - */ - private BigDecimal balance; - - /** - * 邀请类型 1 租户 2代理 ff_agent_invite_type - */ - private Integer inviteType; - - /** - * 额度类型 TenantQuotaType 枚举 - */ - private Integer quotaType; - - /** - * 买分比例 - */ - private BigDecimal scoreRatio; - - /** - * 租户类型 TenantType 枚举 - */ - private Integer tenantType; - - /** - * 透支比例 - */ - private BigDecimal depositRatio; - - /** - * 信誉额度 - */ - private BigDecimal realBalance; - - /** - * 邀请码 - */ - private String inviteCode; - - /** - * 邀请链接 - */ - private String inviteUrl; - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java deleted file mode 100644 index 0344a82..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ff.agent.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 平台邀请注册成本管理对象 ff_tenant_agent_invite_platform - * - * @author shi - * @date 2025-02-27 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentInvitePlatform extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - private Long id; - - /** - * 邀请码id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long inviteId; - - /** - * 平台编码 - */ - private String platformCode; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 成本 - */ - private BigDecimal cost; - - /** - * 使用成本 - */ - private BigDecimal useCost; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java deleted file mode 100644 index f01b70a..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.ff.agent.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 代理邀请注册对象 ff_tenant_agent_invite_register - * - * @author shi - * @date 2025-02-25 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentInviteRegister extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 代理id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long agentId; - - /** - * 邀请码 - */ - private String inviteCode; - - /** - * 账号 - */ - private String account; - - /** - * 密码 - */ - private String password; - - /** - * 缴费金额 - */ - private BigDecimal balance; - - /** - * 注册时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long registerTime; - - /** - * 注册IP - */ - private String registerIp; - - /** - * 注册ip的城市 - */ - private String registerIpCity; - - /** - * 状态 1 待激活 2已激活 InviterRegisterStatus 枚举 - */ - private Integer status; - - /** - * 支付订单id - */ - private String orderId; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java deleted file mode 100644 index 56e1061..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ff.agent.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 代理申请提现审批管理对象 ff_tenant_agent_withdrawal - * - * @author shi - * @date 2025-02-26 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentWithdrawal extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * $column.columnComment - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - /** - * 代理id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long agentId; - - /** - * 佣金余额 - */ - private BigDecimal commissionBalance; - - /** - * 币种协议 - */ - private String currencyAgreement; - - /** - * 钱包地址 - */ - private String walletAddress; - - /** - * 0 未提现 1 提现中 1 已提现 3 已拒绝 - */ - private Integer approvalStatus; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java deleted file mode 100644 index a000b5a..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.ff.base.core.domain; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -/** - * Entity基类 - * - * @author ff - */ -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -public class BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - private Long id; - - /** - * 搜索值 - */ - @JsonIgnore - private String searchValue; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long updateTime; - - /** - * 备注 - */ - private String remark; - - /** - * 请求参数 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map params; - - - public Map getParams() { - if (params == null) { - params = new HashMap<>(); - } - return params; - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java deleted file mode 100644 index 91553c9..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -/** - * 参数配置表 sys_config - * - * @author ff - */ -public class SysConfig extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 参数主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long configId; - - /** - * 参数名称 - */ - private String configName; - - /** - * 参数键名 - */ - private String configKey; - - /** - * 参数键值 - */ - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - private String configType; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getConfigId() { - return configId; - } - - public void setConfigId(Long configId) { - this.configId = configId; - } - - @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") - public String getConfigName() { - return configName; - } - - public void setConfigName(String configName) { - this.configName = configName; - } - - @NotBlank(message = "参数键名长度不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") - public String getConfigKey() { - return configKey; - } - - public void setConfigKey(String configKey) { - this.configKey = configKey; - } - - @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") - public String getConfigValue() { - return configValue; - } - - public void setConfigValue(String configValue) { - this.configValue = configValue; - } - - public String getConfigType() { - return configType; - } - - public void setConfigType(String configType) { - this.configType = configType; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("configId", getConfigId()) - .append("configName", getConfigName()) - .append("configKey", getConfigKey()) - .append("configValue", getConfigValue()) - .append("configType", getConfigType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java deleted file mode 100644 index d55bb34..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; -/** - * 租户数据源对象 sys_datasource - * - * @author liukang - * @date 2024-11-20 - */ -@Data -public class SysDatasource extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键id */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** 租户id */ - private String tenantId; - - /** 连接地址 */ - private String url; - - /** 用户名 */ - private String username; - - /** 密码 */ - private String password; - - /** 数据库驱动 */ - private String driverClassName; - - /** 时区 */ - private String timeZone; - - /** 状态（0 停用 1 启用） */ - private String status; - - /** 时区名称 */ - private String timeZoneName; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java deleted file mode 100644 index 387525b..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.ArrayList; -import java.util.List; - -/** - * 部门表 sys_dept - * - * @author ff - */ -public class SysDept extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 部门ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long deptId; - - /** 父部门ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - /** 祖级列表 */ - private String ancestors; - - /** 部门名称 */ - private String deptName; - - /** 显示顺序 */ - private Integer orderNum; - - /** 负责人 */ - private String leader; - - /** 联系电话 */ - private String phone; - - /** 邮箱 */ - private String email; - - /** 部门状态:0正常,1停用 */ - private String status; - - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 父部门名称 */ - private String parentName; - - /** 子部门 */ - private List children = new ArrayList(); - @JsonSerialize(using = ToStringSerializer.class) - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - @JsonSerialize(using = ToStringSerializer.class) - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - @NotNull(message = "显示顺序不能为空") - public Integer getOrderNum() - { - return orderNum; - } - - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public String getLeader() - { - return leader; - } - - public void setLeader(String leader) - { - this.leader = leader; - } - - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") - public String getPhone() - { - return phone; - } - - public void setPhone(String phone) - { - this.phone = phone; - } - - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java deleted file mode 100644 index 4a4a045..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -/** - * 字典数据表 sys_dict_data - * - * @author ff - */ -public class SysDictData extends BaseEntity { - private static final long serialVersionUID = 1L; - - public interface DictDataSimpleView { - } - - ; - /** - * 字典编码 - */ - @JsonView(DictDataSimpleView.class) - @JsonSerialize(using = ToStringSerializer.class) - private Long dictCode; - - /** - * 字典排序 - */ - @JsonView(DictDataSimpleView.class) - @JsonSerialize(using = ToStringSerializer.class) - private Long dictSort; - - /** - * 字典标签 - */ - @JsonView(DictDataSimpleView.class) - private String dictLabel; - - /** - * 字典键值 - */ - @JsonView(DictDataSimpleView.class) - private String dictValue; - - /** - * 字典类型 - */ - @JsonView(DictDataSimpleView.class) - private String dictType; - - /** - * 样式属性（其他样式扩展） - */ - @JsonView(DictDataSimpleView.class) - private String cssClass; - - /** - * 表格字典样式 - */ - @JsonView(DictDataSimpleView.class) - private String listClass; - - /** - * 是否默认（Y是 N否） - */ - @JsonView(DictDataSimpleView.class) - private String isDefault; - - /** - * 状态（0正常 1停用） - */ - private String status; - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - @JsonView(DictDataSimpleView.class) - private String remark; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getDictCode() { - return dictCode; - } - - public void setDictCode(Long dictCode) { - this.dictCode = dictCode; - } - - @JsonSerialize(using = ToStringSerializer.class) - public Long getDictSort() { - return dictSort; - } - - public void setDictSort(Long dictSort) { - this.dictSort = dictSort; - } - - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 200, message = "字典标签长度不能超过200个字符") - public String getDictLabel() { - return dictLabel; - } - - public void setDictLabel(String dictLabel) { - this.dictLabel = dictLabel; - } - - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 200, message = "字典键值长度不能超过200个字符") - public String getDictValue() { - return dictValue; - } - - public void setDictValue(String dictValue) { - this.dictValue = dictValue; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType() { - return dictType; - } - - public void setDictType(String dictType) { - this.dictType = dictType; - } - - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass() { - return cssClass; - } - - public void setCssClass(String cssClass) { - this.cssClass = cssClass; - } - - public String getListClass() { - return listClass; - } - - public void setListClass(String listClass) { - this.listClass = listClass; - } - - public boolean getDefault() { - return "Y".equals(this.isDefault); - } - - public String getIsDefault() { - return isDefault; - } - - public void setIsDefault(String isDefault) { - this.isDefault = isDefault; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java deleted file mode 100644 index f5d4a04..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - -/** - * 字典类型表 sys_dict_type - * - * @author ff - */ -public class SysDictType extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 字典主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long dictId; - - /** - * 字典名称 - */ - private String dictName; - - /** - * 字典类型 - */ - private String dictType; - - /** - * 状态（0正常 1停用） - */ - private String status; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getDictId() { - return dictId; - } - - public void setDictId(Long dictId) { - this.dictId = dictId; - } - - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName() { - return dictName; - } - - public void setDictName(String dictName) { - this.dictName = dictName; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") - @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") - public String getDictType() { - return dictType; - } - - public void setDictType(String dictType) { - this.dictType = dictType; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java deleted file mode 100644 index b145987..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; - -/** - * 系统访问记录表 sys_logininfor - * - * @author ff - */ -public class SysLogininfor extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long infoId; - - /** - * 用户账号 - */ - private String userName; - - /** - * 登录状态 0成功 1失败 - */ - private String status; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 提示消息 - */ - private String msg; - - /** - * 访问时间 - */ - - @JsonSerialize(using = ToStringSerializer.class) - private Long loginTime; - - public Long getInfoId() { - return infoId; - } - - public void setInfoId(Long infoId) { - this.infoId = infoId; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getIpaddr() { - return ipaddr; - } - - public void setIpaddr(String ipaddr) { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) { - this.loginLocation = loginLocation; - } - - public String getBrowser() { - return browser; - } - - public void setBrowser(String browser) { - this.browser = browser; - } - - public String getOs() { - return os; - } - - public void setOs(String os) { - this.os = os; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Long getLoginTime() { - return loginTime; - } - - public void setLoginTime(Long loginTime) { - this.loginTime = loginTime; - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java deleted file mode 100644 index f09b645..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.ArrayList; -import java.util.List; - -/** - * 菜单权限表 sys_menu - * - * @author ff - */ -public class SysMenu extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 菜单ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long menuId; - - /** - * 菜单名称 - */ - private String menuName; - - /** - * 父菜单名称 - */ - private String parentName; - - /** - * 父菜单ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 路由地址 - */ - private String path; - - /** - * 组件路径 - */ - private String component; - - /** - * 路由参数 - */ - private String query; - - /** - * 路由名称，默认和路由地址相同的驼峰格式（注意：因为vue3版本的router会删除名称相同路由，为避免名字的冲突，特殊情况可以自定义） - */ - private String routeName; - - /** - * 是否为外链（0是 1否） - */ - private String isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 类型（M目录 C菜单 F按钮） - */ - private String menuType; - - /** - * 显示状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限字符串 - */ - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 子菜单 - */ - private List children = new ArrayList(); - - @JsonSerialize(using = ToStringSerializer.class) - public Long getMenuId() { - return menuId; - } - - public void setMenuId(Long menuId) { - this.menuId = menuId; - } - - @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName() { - return menuName; - } - - public void setMenuName(String menuName) { - this.menuName = menuName; - } - - public String getParentName() { - return parentName; - } - - public void setParentName(String parentName) { - this.parentName = parentName; - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - @NotNull(message = "显示顺序不能为空") - public Integer getOrderNum() { - return orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent() { - return component; - } - - public void setComponent(String component) { - this.component = component; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } - - public String getRouteName() { - return routeName; - } - - public void setRouteName(String routeName) { - this.routeName = routeName; - } - - public String getIsFrame() { - return isFrame; - } - - public void setIsFrame(String isFrame) { - this.isFrame = isFrame; - } - - public String getIsCache() { - return isCache; - } - - public void setIsCache(String isCache) { - this.isCache = isCache; - } - - @NotBlank(message = "菜单类型不能为空") - public String getMenuType() { - return menuType; - } - - public void setMenuType(String menuType) { - this.menuType = menuType; - } - - public String getVisible() { - return visible; - } - - public void setVisible(String visible) { - this.visible = visible; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms() { - return perms; - } - - public void setPerms(String perms) { - this.perms = perms; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("query", getQuery()) - .append("routeName", getRouteName()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java deleted file mode 100644 index 25d3193..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -/** - * 操作日志记录表 oper_log - * - * @author ff - */ -@Data -public class SysOperLog extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long operId; - - /** - * 操作模块 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 请求方法 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求url - */ - private String operUrl; - - /** - * 操作地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long operTime; - - /** - * 消耗时间 - */ - private Long costTime; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java deleted file mode 100644 index d19295b..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -/** - * 岗位表 sys_post - * - * @author ff - */ -public class SysPost extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 岗位序号 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long postId; - - /** - * 岗位编码 - */ - private String postCode; - - /** - * 岗位名称 - */ - private String postName; - - /** - * 岗位排序 - */ - private Integer postSort; - - /** - * 状态（0正常 1停用） - */ - private String status; - - /** - * 用户是否存在此岗位标识 默认不存在 - */ - private boolean flag = false; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getPostId() { - return postId; - } - - public void setPostId(Long postId) { - this.postId = postId; - } - - @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") - public String getPostCode() { - return postCode; - } - - public void setPostCode(String postCode) { - this.postCode = postCode; - } - - @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") - public String getPostName() { - return postName; - } - - public void setPostName(String postName) { - this.postName = postName; - } - - @NotNull(message = "显示顺序不能为空") - public Integer getPostSort() { - return postSort; - } - - public void setPostSort(Integer postSort) { - this.postSort = postSort; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public boolean isFlag() { - return flag; - } - - public void setFlag(boolean flag) { - this.flag = flag; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("postId", getPostId()) - .append("postCode", getPostCode()) - .append("postName", getPostName()) - .append("postSort", getPostSort()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java deleted file mode 100644 index faa01f8..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.Set; - -/** - * 角色表 sys_role - * - * @author ff - */ -public class SysRole extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 角色权限 - */ - private String roleKey; - - /** - * 角色排序 - */ - private Integer roleSort; - - /** - * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） - */ - private String dataScope; - - /** - * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） - */ - private boolean menuCheckStrictly; - - /** - * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） - */ - private boolean deptCheckStrictly; - - /** - * 角色状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private String delFlag; - - /** - * 用户是否存在此角色标识 默认不存在 - */ - private boolean flag = false; - - /** - * 菜单组 - */ - private Long[] menuIds; - - /** - * 部门组（数据权限） - */ - private Long[] deptIds; - - /** - * 角色菜单权限 - */ - private Set permissions; - - public SysRole() { - - } - - public SysRole(Long roleId) { - this.roleId = roleId; - } - - @JsonSerialize(using = ToStringSerializer.class) - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - public boolean isAdmin() { - return isAdmin(this.roleId); - } - - public static boolean isAdmin(Long roleId) { - return roleId != null && 1L == roleId; - } - - @NotBlank(message = "角色名称不能为空") - @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - @NotBlank(message = "权限字符不能为空") - @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") - public String getRoleKey() { - return roleKey; - } - - public void setRoleKey(String roleKey) { - this.roleKey = roleKey; - } - - @NotNull(message = "显示顺序不能为空") - public Integer getRoleSort() { - return roleSort; - } - - public void setRoleSort(Integer roleSort) { - this.roleSort = roleSort; - } - - public String getDataScope() { - return dataScope; - } - - public void setDataScope(String dataScope) { - this.dataScope = dataScope; - } - - public boolean isMenuCheckStrictly() { - return menuCheckStrictly; - } - - public void setMenuCheckStrictly(boolean menuCheckStrictly) { - this.menuCheckStrictly = menuCheckStrictly; - } - - public boolean isDeptCheckStrictly() { - return deptCheckStrictly; - } - - public void setDeptCheckStrictly(boolean deptCheckStrictly) { - this.deptCheckStrictly = deptCheckStrictly; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public boolean isFlag() { - return flag; - } - - public void setFlag(boolean flag) { - this.flag = flag; - } - - public Long[] getMenuIds() { - return menuIds; - } - - public void setMenuIds(Long[] menuIds) { - this.menuIds = menuIds; - } - - public Long[] getDeptIds() { - return deptIds; - } - - public void setDeptIds(Long[] deptIds) { - this.deptIds = deptIds; - } - - public Set getPermissions() { - return permissions; - } - - public void setPermissions(Set permissions) { - this.permissions = permissions; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java deleted file mode 100644 index e8025f5..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和部门关联 sys_role_dept - * - * @author ff - */ -public class SysRoleDept { - /** - * 角色ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long roleId; - - /** - * 部门ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long deptId; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - @JsonSerialize(using = ToStringSerializer.class) - public Long getDeptId() { - return deptId; - } - - public void setDeptId(Long deptId) { - this.deptId = deptId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("deptId", getDeptId()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java deleted file mode 100644 index 8741de2..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和菜单关联 sys_role_menu - * - * @author ff - */ -public class SysRoleMenu { - /** - * 角色ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long roleId; - - /** - * 菜单ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long menuId; - - @JsonSerialize(using = ToStringSerializer.class) - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - @JsonSerialize(using = ToStringSerializer.class) - public Long getMenuId() { - return menuId; - } - - public void setMenuId(Long menuId) { - this.menuId = menuId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("menuId", getMenuId()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java deleted file mode 100644 index fdede26..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import java.util.List; - -/** - * 用户对象 sys_user - * - * @author ff - */ -@Data -public class SysUser extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - - /** - * 部门ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long deptId; - - /** - * 用户账号 - */ - @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - private String userName; - - /** - * 用户昵称 - */ - @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - private String nickName; - - /** - * 用户邮箱 - */ - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - private String email; - - /** - * 手机号码 - */ - @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - private String phonenumber; - - /** - * 用户性别 - */ - private String sex; - - /** - * 用户头像 - */ - private String avatar; - - /** - * 密码 - */ - private String password; - - /** - * 帐号状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private String delFlag; - - /** - * 最后登录IP - */ - private String loginIp; - - /** - * 最后登录时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long loginDate; - - /** - * 部门对象 - */ - private SysDept dept; - - /** - * 角色对象 - */ - private List roles; - - /** - * 角色组 - */ - private Long[] roleIds; - - /** - * 岗位组 - */ - private Long[] postIds; - - /** - * 角色ID - */ - private Long roleId; - - - /** - * 登录类型 0 后台 1 租户 2 代理 - */ - private Integer loginType; - - - /** - * 真实姓名 - */ - private String realName; - - - public SysUser() { - - } - - public SysUser(Long userId) { - this.userId = userId; - } - - - public boolean isAdmin() { - return isAdmin(this.userId); - } - - public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; - } - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java deleted file mode 100644 index 216f539..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.ff.base.system.domain; - -/** - * 当前在线会话 - * - * @author ff - */ -public class SysUserOnline { - /** - * 会话编号 - */ - private String tokenId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 用户名称 - */ - private String userName; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地址 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 登录时间 - */ - private Long loginTime; - - public String getTokenId() { - return tokenId; - } - - public void setTokenId(String tokenId) { - this.tokenId = tokenId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getIpaddr() { - return ipaddr; - } - - public void setIpaddr(String ipaddr) { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) { - this.loginLocation = loginLocation; - } - - public String getBrowser() { - return browser; - } - - public void setBrowser(String browser) { - this.browser = browser; - } - - public String getOs() { - return os; - } - - public void setOs(String os) { - this.os = os; - } - - public Long getLoginTime() { - return loginTime; - } - - public void setLoginTime(Long loginTime) { - this.loginTime = loginTime; - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java deleted file mode 100644 index 144c67d..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ff.base.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和岗位关联 sys_user_post - * - * @author ff - */ -public class SysUserPost { - /** - * 用户ID - */ - private Long userId; - - /** - * 岗位ID - */ - private Long postId; - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getPostId() { - return postId; - } - - public void setPostId(Long postId) { - this.postId = postId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("postId", getPostId()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java deleted file mode 100644 index 114b29a..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ff.base.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和角色关联 sys_user_role - * - * @author ff - */ -public class SysUserRole { - /** - * 用户ID - */ - private Long userId; - - /** - * 角色ID - */ - private Long roleId; - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("roleId", getRoleId()) - .toString(); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java deleted file mode 100644 index 1c62c3d..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * 代理对象 ff_tenant_agent - * - * @author shi - * @date 2025-02-25 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgent extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 账号 - */ - private String account; - - /** - * 密码 - */ - private String password; - - /** - * 注册时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long registerTime; - - /** - * 注册IP - */ - private String registerIp; - - /** - * 注册ip的城市 - */ - private String registerIpCity; - - /** - * 最后登录ip - */ - private String loginIp; - - /** - * 最后登录时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long loginData; - - /** - * 租户状态 1正常 0停用 - */ - private Boolean tenantStatus; - - - /** - * 货币协议 - */ - private String currencyAgreement; - - /** - * 钱包地址 - */ - private String walletAddress; - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java deleted file mode 100644 index 5ecedeb..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 租户成本管理对象 ff_tenant_platform - * - * @author shi - * @date 2025-02-27 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantPlatform extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - private Long id; - - /** - * 租户id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long tenantId; - - /** - * 平台编码 - */ - private String platformCode; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 成本 - */ - private BigDecimal cost; - - /** - * 使用成本 - */ - private BigDecimal useCost; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java deleted file mode 100644 index 5cedab9..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 用户租户密钥对象 ff_tenant_secret_key - * - * @author shi - * @date 2025-02-25 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantSecretKey extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 租户key - */ - private String tenantKey; - - /** - * 密码 - */ - @JsonIgnore - private String password; - - /** - * 注册时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long registerTime; - - /** - * 注册ip - */ - private String registerIp; - - /** - * 注册ip的城市 - */ - private String registerIpCity; - - /** - * 最后登录ip - */ - private String loginIp; - - /** - * 最后登录时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long loginData; - - /** - * 上级代理id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long agentId; - - /** - * 商户后缀 - */ - private String tenantSn; - - /** - * 租户密钥 - */ - private String tenantSecret; - - /** - * 租户状态 1正常 0停用 - */ - private Boolean tenantStatus; - - /** - * 额度类型 TenantQuotaType 枚举 - */ - private Integer quotaType; - - /** - * 买分比例 - */ - private BigDecimal scoreRatio; - - /** - * 租户类型 TenantType 枚举 - */ - private Integer tenantType; - - /** - * 透支比例 - */ - private BigDecimal depositRatio; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java deleted file mode 100644 index 24caffb..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ff.base.system.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * 租户白名单对象 ff_tenant_white - * - * @author shi - * @date 2025-02-27 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantWhite extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - private Long id; - - /** - * 租户id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long tenantId; - - /** - * 白名单ip地址 - */ - private String whiteIp; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java deleted file mode 100644 index dad7638..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ff.common.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 币种对象 ff_currency - * - * @author shi - * @date 2025-02-10 - */ -@Data -public class Currency extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 币种状态（0正常 1停用） - */ - private String status; - - /** - * 币种国家 - */ - private String country; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 币种符号 - */ - private String currencySign; - - /** - * 汇率 - */ - private BigDecimal gameRate; - - /** - * 币种展示内容 - */ - private String currencyDisplay; - - /** - * 币种名称 - */ - private String currencyName; - - /** - * 币种全称 - */ - private String fullName; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java deleted file mode 100644 index 4cd99b6..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ff.common.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -/** - * 系统语种管理 对象 ff_lang - * - * @author shi - * @date 2025-02-10 - */ -@Data -public class Lang extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 语言名称 - */ - private String name; - - /** - * 国家代码 - */ - private String country; - - /** - * 语种 - */ - private String langCode; - - /** - * 语种开关 0 关闭 1 开启 - */ - private Boolean langStatus; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java deleted file mode 100644 index 56a71bd..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ff.common.domain; - -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 平台利润成本管理对象 ff_tenant_agent_platform - * - * @author shi - * @date 2025-02-27 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantAgentPlatform extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - private Long id; - - /** - * 平台编码 - */ - private String platformCode; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 成本 - */ - private BigDecimal cost; - - /** - * 使用成本 - */ - private BigDecimal useCost; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java deleted file mode 100644 index 2e99fc0..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.ff.common.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 租户游戏配额对象 ff_tenant_game_quota - * - * @author shi - * @date 2025-02-20 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantGameQuota extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 租户key - */ - private String tenantKey; - - /** - * 游戏额度 - */ - private BigDecimal balance; - - /** - * 额度类型 TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度 - */ - private String quotaType; - - /** - * 版本号 - */ - private Integer version; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java deleted file mode 100644 index 5eadf7c..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ff.common.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 租户游戏额度流水对象 ff_tenant_game_quota_flow - * - * @author shi - * @date 2025-02-20 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantGameQuotaFlow extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 租户key - */ - private String tenantKey; - - /** - * 额度类型 - */ - private String quotaType; - - /** - * 用户账号id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long memberId; - - - /** - * 平台 - */ - private String platformCode; - - /** - * 币种代码 - */ - private String currencyCode; - - - /** - * 充值类型 false 扣除 true 充值 - */ - private Boolean isOut; - - /** - * 操作类型 operationType枚举 - */ - private Integer operationType; - - /** - * 游戏额度之前 - */ - private BigDecimal balanceBefore; - - /** - * 游戏额度 - */ - private BigDecimal balance; - - /** - * 兑换比例 - */ - private BigDecimal exchangeRatio; - - /** - * 兑换金额 - */ - private BigDecimal exchangeMoney; - - - /** - * 游戏额度之后 - */ - private BigDecimal balanceAfter; - - /** - * 源ID - */ - private String sourceId; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java deleted file mode 100644 index 28efd1f..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ff.common.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 币种汇率对象 ff_tenant_quota_exchange - * - * @author shi - * @date 2025-02-21 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class TenantQuotaExchange extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 兑换币种编码 - */ - private String exchangeCurrencyCode; - - /** - * 市场兑换金额 - */ - private BigDecimal exchangeRate; - - /** - * 汇率差 1百分比 2 固定值 - */ - private Integer differenceType; - - /** - * 汇率差值 - */ - private BigDecimal differenceValue; - - /** - * 实际兑换金额 - */ - private BigDecimal actualBalance; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java deleted file mode 100644 index 173c9b5..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ff.game.domain; - -import lombok.Data; - -import java.io.Serializable; -import java.util.HashMap; - -/** - * key:我们的币种 - * - * @author cengy - */ -@Data -public class CurrencyInfo extends HashMap implements Serializable { -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java deleted file mode 100644 index da61f05..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ff.game.domain; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Map; - -/** - * @author cengy - */ -@Data -public class ExtInfo implements Serializable { - - // 币种信息，key为其它平台的币种id，value为我们自己的币种 - private Map currency; - - private Map betLimit; - - public String getOurCurrency(String currencyId) { - return currency == null ? null : currency.get(currencyId); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java deleted file mode 100644 index bad00da..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ff.game.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * 平台子游戏管理对象 ff_game - * - * @author shi - * @date 2025-02-10 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class Game extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 排序 - */ - private Integer sortNo; - - /** - * 游戏平台id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long platformId; - - /** - * 游戏第三方id - */ - private String gameCode; - - /** - * 支持的终端类型 1:电脑网页、2:手机网页、3:电脑/手机网页 - */ - private Integer ingress; - - /** - * 第三方来源分类 - */ - private String gameSourceType; - - /** - * 游戏名称 - */ - private String gameName; - - /** - * 是否支持免费游戏 1 支持 0 不支持 - */ - private Boolean freespin; - - /** - * 是否支持试玩 0关闭 1开启 - */ - private Boolean demoStatus; - - /** - * 维护开关 维护状态 - */ - private Boolean stopStatus; - - /** - * 平台code - */ - private String platformCode; - - /** - * 平台类型 - */ - private Integer platformType; - - /** - * 名称信息 - */ - private List nameInfo; - - /** - * 游戏id - */ - private String gameId; -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java deleted file mode 100644 index 4453290..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.ff.game.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 会员投注细目对象 ff_game_betting_details - * - * @author shi - * @date 2025-02-10 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class GameBettingDetails extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - - /** - * 租户key - */ - private String tenantKey; - - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 会员id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long memberId; - - /** - * 游戏id - */ - private String gameCode; - - /** - * 游戏id - */ - @JsonSerialize(using = ToStringSerializer.class) - private String gameId; - - /** - * 游戏类型 ff_game_type 字典 - */ - private Integer gameType; - - /** - * 游戏平台 - */ - private String platformCode; - - /** - * 游戏名称 - */ - private String gameName; - - /** - * 注单状态 1: 赢 2: 输 3: 平局 4 未知 - */ - private Integer gameStatus; - - /** - * 注单类型 - * 1 一般下注 - * 9 舞龙争霸和梅杜莎的 - * 11 道具卡 - * 12 游戏内购 - * 17 满额必开 (下注) - * 18 满额必开 (开奖) - * 19 免费游戏 - * 28 旋转奖金 - * DG - * （1:注单，2:红包小费） - * AE - * 正常状况： - * 预设：0 - * 结果更改过状况： - * Resettle / Unsettle / Voidsettle / Unvoidsettle: 1 - * Voidbet: -1 - */ - private Integer gameStatusType; - - /** - * 游戏币种类型 - */ - private String gameCurrencyCode; - - /** - * 游戏账号 - */ - private String account; - - - /** - * 局号 - */ - private String round; - - /** - * 桌号 - */ - private String table; - - /** - * 座号 - */ - private String seat; - - /** - * 投注内容，部分游戏字段内容较长，建议数据库字段类型为 text - */ - private String betContent; - - /** - * 游戏注单唯一值 - */ - private String wagersId; - - /** - * 投注时间 (Unix 时间戳) - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long wagersTime; - - /** - * 投注金额 - */ - private BigDecimal betAmount; - - /** - * 派彩时间 (Unix 时间戳) - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long payoffTime; - - /** - * 派彩金额 - */ - private BigDecimal payoffAmount; - - - /** - * 对帐时间 (Unix 时间戳) - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long settlementTime; - - /** - * 有效投注金额 ※注 1 - */ - private BigDecimal turnover; - - /** - * 订单id - */ - private String orderNo; - - /** - * 结算状态 1 未结算 2已结算 3 已撤单 4 已取消 - */ - private Integer settlementStatus; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java deleted file mode 100644 index 62a074c..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.ff.game.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * 会员金额转移记录对象 ff_game_exchange_money - * - * @author shi - * @date 2025-02-12 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class GameExchangeMoney extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 租户key - */ - private String tenantKey; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 第三方交易id - */ - private String transactionId; - - /** - * 订单id - */ - private String orderId; - - /** - * 会员id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long memberId; - - /** - * 游戏平台 - */ - private String platformCode; - - /** - * 操作金额 - */ - private BigDecimal balance; - - /** - * 租户操作额度 - */ - private BigDecimal quota; - - /** - * 转账前金额(游戏币) - */ - private BigDecimal coinBefore; - - /** - * 转账后金额(游戏币) - */ - private BigDecimal coinAfter; - - /** - * 转账前金额(指定货币) - */ - private BigDecimal currencyBefore; - - /** - * 转账后金额(指定货币) - */ - private BigDecimal currencyAfter; - - - /** - * 转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 3 游戏商转移额度到平台商 - */ - private Integer exchangeType; - - /** - * 状态，0:进行中、1:成功、2:失败 - */ - private Integer status; - - /** - * 步 GameExchangeStep 枚举 - */ - private Integer step; - - /** - * 步骤状态 GameExchangeStepStatus 枚举 - */ - private Integer stepStatus; -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java deleted file mode 100644 index 5a5ee78..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ff.game.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * 免费赠送游戏记录对象 ff_game_free_record - * - * @author shi - * @date 2025-02-13 - */ -@Data -@AllArgsConstructor -@SuperBuilder -@NoArgsConstructor -public class GameFreeRecord extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 币种编码 - */ - private String currencyCode; - - /** - * 平台代码 - */ - private String platformCode; - - /** - * 免费局数序号（唯一标识符） - */ - private String referenceId; - - /** - * 会员id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long memberId; - - /** - * 用户账号 - */ - private String memberAccount; - - /** - * 游戏id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long gameId; - - /** - * 免费游戏局数可使用的开始时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long sendTime; - - /** - * 免费局数过期时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long expiredTime; - - /** - * 免费局数记录更新时间 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long freeUpdateTime; - - /** - * 免费局数赠送的游戏名称 - */ - private String sendGame; - - /** - * 免费局数赠送的数量 - */ - private Integer sendAmount; - - /** - * 已使用的免费局数数量 - */ - private Integer usedAmount; - - /** - * 未使用的免费局数数量 - */ - private Integer unusedAmount; - - /** - * 免费状态 1正常 0 取消 - */ - private Integer freeStatus; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java deleted file mode 100644 index 2b671a4..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ff.game.domain; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 其它字段按需加 - * - * @author cengy - */ -@Data -public class KeyInfo implements Serializable { - - private String code; - private String key; - private String currency; - private String password; - private String providerCode; - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java deleted file mode 100644 index 3ef380d..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ff.game.domain; - -import java.io.Serializable; -import java.util.HashMap; - -/** - * @author cengy - */ -public class LangInfo extends HashMap implements Serializable { - - public String get(String lang) { - return super.get(lang); - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java deleted file mode 100644 index f5896a9..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ff.game.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @author cengy - */ -@Data -@AllArgsConstructor -@Builder -@NoArgsConstructor -public class NameInfo implements Serializable { - /** - * 名称 - */ - private String name; - /** - * 长 - */ - private String lang; -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java deleted file mode 100644 index f786d52..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.ff.game.domain; - -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @author cengy - */ -@Data -public class Platform extends BaseEntity { - - /** - * 排序 - */ - private Integer sortNo; - /** - * 平台code - */ - private String platformCode; - /** - * 平台名称 - */ - private String platformName; - - /** - * 状态：true:启用 false:停用 - */ - private Boolean stopStatus; - - private List platformInfo; - private List keyInfo; - private LangInfo langInfo; - private CurrencyInfo currencyInfo; - private UrlInfo urlInfo; - /** - * 代理类型 0:代理单币种 1:代理多币种 - */ - private Integer type; - - private ExtInfo extInfo; - - - @Getter - @AllArgsConstructor - public enum Type { - /** - * 代理类型 0:代理单币种 1:代理多币种 - */ - SINGLE(0, "代理单币种"), - MULTI(1, "代理多币种"); - - private Integer code; - private String name; - - } - - public boolean isMultiAgent() { - return this.type == Type.MULTI.getCode(); - } - - /** - * 获取我们货币 - * - * @param currency 它们的货币 - * @return {@link String } - */ - public String getOurCurrency(String currency) { - Set> entrySet= currencyInfo.entrySet(); - for (Map.Entry entry : entrySet) { - if (entry.getValue().equals(currency)) { - return entry.getKey(); - } - } - return null; - } -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java deleted file mode 100644 index b236435..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ff.game.domain; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @author cengy - */ -@Data -public class PlatformInfo implements Serializable { - private String code; - private String name; - private int type; -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java deleted file mode 100644 index 2dfb5bf..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ff.game.domain; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @author cengy - */ -@Data -public class UrlInfo implements Serializable { - - private String url; - private String loginUrl; - private String hallCode; - /** - * 投注网址 - */ - private String betUrl; -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java b/ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java deleted file mode 100644 index 19c7d77..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ff.member.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * 会员对象 ff_member - * - * @author shi - * @date 2025-02-11 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class Member extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 租户key - */ - private String tenantKey; - - /** - * 会员账号 - */ - private String memberAccount; - - /** - * 游戏账号 - */ - private String gameAccount; - - /** - * 平台编码 - */ - private String platformCode; - - /** - * 币种编码 - */ - private String currencyCode; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java b/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java deleted file mode 100644 index da3731c..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ff.sys.domain; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -/** - * 系统反馈对象 ff_sys_feedback - * - * @author shi - * @date 2025-02-27 - */ -@Data -public class SysFeedback extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * $column.columnComment - */ - private Long id; - - /** - * 用户类型 1 租户 2代理 - */ - private Integer userType; - - /** - * 用户id - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - - /** - * 标题 - */ - private String title; - - /** - * 手机号 - */ - private String phone; - - /** - * 反馈内容 - */ - private String content; - - /** - * 状态 1待处理 2已处理 - */ - private Integer status; - - /** - * 回复内容 - */ - private String replyContent; - - -} diff --git a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java b/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java deleted file mode 100644 index 71eac6d..0000000 --- a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.ff.sys.domain; - -import com.ff.base.core.domain.BaseEntity; -import lombok.Data; - -/** - * 系统公告对象 ff_sys_notice - * - * @author shi - * @date 2025-02-28 - */ -@Data -public class SysNotice extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * $column.columnComment - */ - private Long id; - - /** - * 标题 - */ - private String title; - - /** - * 内容 - */ - private String content; - - -} diff --git a/ff-game/pom.xml b/ff-game/pom.xml index c51f537..253cdea 100644 --- a/ff-game/pom.xml +++ b/ff-game/pom.xml @@ -18,7 +18,7 @@ com.ff - ff-mysql-entity + ff-domain com.xuxueli diff --git a/pom.xml b/pom.xml index 9b00045..8bf1d59 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ com.ff - ff-mysql-entity + ff-domain ${ff.version} @@ -217,7 +217,7 @@ ff-game ff-fetcher - ff-bean/ff-mysql + ff-bean/ff-domain pom