shi
/
game-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade_s1' into main-pp 

# Conflicts:
#	ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentCommission.java
#	ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java
#	ff-game/src/main/java/com/ff/api/controller/ApiGameController.java
#	ff-game/src/main/java/com/ff/base/enums/TimeOutType.java
#	ff-game/src/main/java/com/ff/base/enums/TriggerType.java
#	ff-game/src/main/java/com/ff/base/manager/AsyncManager.java
#	ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java
#	ff-game/src/main/java/com/ff/quartz/task/GameTask.java
#	ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java
#	ff-game/src/main/resources/mapper/game/GameMapper.xml
main-pp
shi 2025-04-12 14:50:20 +08:00
parent ff7ddea13e 180d454907
commit d1be064c7b
654 changed files with 11532 additions and 15122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
ff-base/pom.xml
View File

@ -1,207 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ff</artifactId>
<groupId>com.ff</groupId>
<version>0.0.1</version>
</parent>
<groupId>com.ff</groupId>
<artifactId>ff-base</artifactId>
<version>0.0.1</version>
<name>ff-base</name>
<description>ff-base</description>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.dtflys.forest</groupId>
<artifactId>forest-spring-boot-starter</artifactId>
<version>1.6.3</version>
</dependency>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.5.15</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- SpringBoot 拦截器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
</dependency>
<!-- Spring框架基本的核心工具 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<!-- SpringWeb模块 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<!-- spring security 安全认证 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
<!-- 自定义验证注解 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- JSON工具类 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
<!--http-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<!-- yml解析器 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
<!-- Jaxb -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
</dependency>
<!-- servlet包 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- 二维码生成 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

25
ff-base/src/main/java/com/ff/base/enums/TimeOutType.java
View File

@ -1,25 +0,0 @@
package com.ff.base.enums;
import com.alibaba.druid.filter.AutoLoad;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 超时类型
*
* @author shi
* @date 2025/04/09
*/
@AllArgsConstructor
@Getter
public enum TimeOutType {
GAME_EXCHANGE_MONEY("gameExchangeMoney", "游戏余额转移");
/**
* 代码
*/
private final String code;
/**
* 信息
*/
private final String info;
}

21
ff-base/src/main/java/com/ff/base/enums/TriggerType.java
View File

@ -1,21 +0,0 @@
package com.ff.base.enums;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
/**
* 触发类型
*
* @author shi
* @date 2025/04/09
*/
@Getter
@AllArgsConstructor
public enum TriggerType {
MANUAL(1, "用户调用手动触发"),
TIMER(2, "定时器触发");
private final int code;
private final String description;
}

146
ff-base/src/main/java/com/ff/base/system/domain/SysLogininfor.java
View File

@ -1,146 +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.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.core.domain.BaseEntity;
/**
* 系统访问记录表 sys_logininfor
*
* @author ff
*/
public class SysLogininfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
@Excel(name = "序号", cellType = ColumnType.NUMERIC)
@JsonSerialize(using = ToStringSerializer.class)
private Long infoId;
/** 用户账号 */
@Excel(name = "用户账号")
private String userName;
/** 登录状态 0成功 1失败 */
@Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
private String status;
/** 登录IP地址 */
@Excel(name = "登录地址")
private String ipaddr;
/** 登录地点 */
@Excel(name = "登录地点")
private String loginLocation;
/** 浏览器类型 */
@Excel(name = "浏览器")
private String browser;
/** 操作系统 */
@Excel(name = "操作系统")
private String os;
/** 提示消息 */
@Excel(name = "提示消息")
private String msg;
/** 访问时间 */
@JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
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;
}
}

279
ff-base/src/main/java/com/ff/base/system/domain/SysMenu.java
View File

@ -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<SysMenu> children = new ArrayList<SysMenu>();
@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<SysMenu> getChildren()
{
return children;
}
public void setChildren(List<SysMenu> 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();
}
}

270
ff-base/src/main/java/com/ff/base/system/domain/SysOperLog.java
View File

@ -1,270 +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.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.core.domain.BaseEntity;
/**
* 操作日志记录表 oper_log
*
* @author ff
*/
public class SysOperLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 日志主键 */
@Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
@JsonSerialize(using = ToStringSerializer.class)
private Long operId;
/** 操作模块 */
@Excel(name = "操作模块")
private String title;
/** 业务类型（0其它 1新增 2修改 3删除） */
@Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
private Integer businessType;
/** 业务类型数组 */
private Integer[] businessTypes;
/** 请求方法 */
@Excel(name = "请求方法")
private String method;
/** 请求方式 */
@Excel(name = "请求方式")
private String requestMethod;
/** 操作类别（0其它 1后台用户 2手机端用户） */
@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
private Integer operatorType;
/** 操作人员 */
@Excel(name = "操作人员")
private String operName;
/** 部门名称 */
@Excel(name = "部门名称")
private String deptName;
/** 请求url */
@Excel(name = "请求地址")
private String operUrl;
/** 操作地址 */
@Excel(name = "操作地址")
private String operIp;
/** 操作地点 */
@Excel(name = "操作地点")
private String operLocation;
/** 请求参数 */
@Excel(name = "请求参数")
private String operParam;
/** 返回参数 */
@Excel(name = "返回参数")
private String jsonResult;
/** 操作状态（0正常 1异常） */
@Excel(name = "状态", readConverterExp = "0=正常,1=异常")
private Integer status;
/** 错误消息 */
@Excel(name = "错误消息")
private String errorMsg;
/** 操作时间 */
@JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Long operTime;
/** 消耗时间 */
@Excel(name = "消耗时间", suffix = "毫秒")
private Long costTime;
public Long getOperId()
{
return operId;
}
public void setOperId(Long operId)
{
this.operId = operId;
}
public String getTitle()
{
return title;
}
public void setTitle(String title)
{
this.title = title;
}
public Integer getBusinessType()
{
return businessType;
}
public void setBusinessType(Integer businessType)
{
this.businessType = businessType;
}
public Integer[] getBusinessTypes()
{
return businessTypes;
}
public void setBusinessTypes(Integer[] businessTypes)
{
this.businessTypes = businessTypes;
}
public String getMethod()
{
return method;
}
public void setMethod(String method)
{
this.method = method;
}
public String getRequestMethod()
{
return requestMethod;
}
public void setRequestMethod(String requestMethod)
{
this.requestMethod = requestMethod;
}
public Integer getOperatorType()
{
return operatorType;
}
public void setOperatorType(Integer operatorType)
{
this.operatorType = operatorType;
}
public String getOperName()
{
return operName;
}
public void setOperName(String operName)
{
this.operName = operName;
}
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
public String getOperUrl()
{
return operUrl;
}
public void setOperUrl(String operUrl)
{
this.operUrl = operUrl;
}
public String getOperIp()
{
return operIp;
}
public void setOperIp(String operIp)
{
this.operIp = operIp;
}
public String getOperLocation()
{
return operLocation;
}
public void setOperLocation(String operLocation)
{
this.operLocation = operLocation;
}
public String getOperParam()
{
return operParam;
}
public void setOperParam(String operParam)
{
this.operParam = operParam;
}
public String getJsonResult()
{
return jsonResult;
}
public void setJsonResult(String jsonResult)
{
this.jsonResult = jsonResult;
}
public Integer getStatus()
{
return status;
}
public void setStatus(Integer status)
{
this.status = status;
}
public String getErrorMsg()
{
return errorMsg;
}
public void setErrorMsg(String errorMsg)
{
this.errorMsg = errorMsg;
}
public Long getOperTime()
{
return operTime;
}
public void setOperTime(Long operTime)
{
this.operTime = operTime;
}
public Long getCostTime()
{
return costTime;
}
public void setCostTime(Long costTime)
{
this.costTime = costTime;
}
}

245
ff-base/src/main/java/com/ff/base/system/domain/SysRole.java
View File

@ -1,245 +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.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
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 */
@Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
/** 角色名称 */
@Excel(name = "角色名称")
private String roleName;
/** 角色权限 */
@Excel(name = "角色权限")
private String roleKey;
/** 角色排序 */
@Excel(name = "角色排序")
private Integer roleSort;
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
@Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
private String dataScope;
/** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
private boolean menuCheckStrictly;
/** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
private boolean deptCheckStrictly;
/** 角色状态（0正常 1停用） */
@Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 用户是否存在此角色标识 默认不存在 */
private boolean flag = false;
/** 菜单组 */
private Long[] menuIds;
/** 部门组（数据权限） */
private Long[] deptIds;
/** 角色菜单权限 */
private Set<String> 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<String> getPermissions()
{
return permissions;
}
public void setPermissions(Set<String> 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();
}
}

113
ff-base/src/main/java/com/ff/base/system/domain/SysUserOnline.java
View File

@ -1,113 +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;
}
}

81
ff-bean/comp-redis/pom.xml 100644
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ff</artifactId>
<groupId>com.ff</groupId>
<version>0.0.1</version>
</parent>
<artifactId>comp-redis</artifactId>
<version>0.0.1</version>
<name>comp-redis</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 自定义验证注解 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.15</version>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<finalName>comp-redis</finalName>
</build>
</project>

243
ff-bean/comp-redis/src/main/java/com/ff/redis/GRedisCache.java 100644
View File

@ -0,0 +1,243 @@
package com.ff.redis;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* spring redis 工具类
*
* @author ff
**/
@SuppressWarnings(value = {"unchecked", "rawtypes"})
@Component
public class GRedisCache {
@Autowired
public RedisTemplate redisTemplate;
/**
* 缓存基本的对象，Integer、String、实体类等
*
* @param key 缓存的键值
* @param value 缓存的值
*/
public <T> void setCacheObject(final String key, final T value) {
redisTemplate.opsForValue().set(key, value);
}
/**
* 缓存基本的对象，Integer、String、实体类等
*
* @param key 缓存的键值
* @param value 缓存的值
* @param timeout 时间
* @param timeUnit 时间颗粒度
*/
public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
}
/**
* 设置有效时间
*
* @param key Redis键
* @param timeout 超时时间
* @return true=设置成功；false=设置失败
*/
public boolean expire(final String key, final long timeout) {
return expire(key, timeout, TimeUnit.SECONDS);
}
/**
* 设置有效时间
*
* @param key Redis键
* @param timeout 超时时间
* @param unit 时间单位
* @return true=设置成功；false=设置失败
*/
public boolean expire(final String key, final long timeout, final TimeUnit unit) {
return redisTemplate.expire(key, timeout, unit);
}
/**
* 获取有效时间
*
* @param key Redis键
* @return 有效时间
*/
public long getExpire(final String key) {
return redisTemplate.getExpire(key);
}
/**
* 判断 key是否存在
*
* @param key 键
* @return true 存在 false不存在
*/
public Boolean hasKey(String key) {
return redisTemplate.hasKey(key);
}
/**
* 获得缓存的基本对象。
*
* @param key 缓存键值
* @return 缓存键值对应的数据
*/
public <T> T getCacheObject(final String key) {
ValueOperations<String, T> operation = redisTemplate.opsForValue();
return operation.get(key);
}
/**
* 删除单个对象
*
* @param key
*/
public boolean deleteObject(final String key) {
return redisTemplate.delete(key);
}
/**
* 删除集合对象
*
* @param collection 多个对象
* @return
*/
public boolean deleteObject(final Collection collection) {
return redisTemplate.delete(collection) > 0;
}
/**
* 缓存List数据
*
* @param key 缓存的键值
* @param dataList 待缓存的List数据
* @return 缓存的对象
*/
public <T> long setCacheList(final String key, final List<T> dataList) {
Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
return count == null ? 0 : count;
}
/**
* 获得缓存的list对象
*
* @param key 缓存的键值
* @return 缓存键值对应的数据
*/
public <T> List<T> getCacheList(final String key) {
return redisTemplate.opsForList().range(key, 0, -1);
}
/**
* 缓存Set
*
* @param key 缓存键值
* @param dataSet 缓存的数据
* @return 缓存数据的对象
*/
public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
Iterator<T> it = dataSet.iterator();
while (it.hasNext()) {
setOperation.add(it.next());
}
return setOperation;
}
/**
* 获得缓存的set
*
* @param key
* @return
*/
public <T> Set<T> getCacheSet(final String key) {
return redisTemplate.opsForSet().members(key);
}
/**
* 缓存Map
*
* @param key
* @param dataMap
*/
public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
if (dataMap != null) {
redisTemplate.opsForHash().putAll(key, dataMap);
}
}
/**
* 获得缓存的Map
*
* @param key
* @return
*/
public <T> Map<String, T> getCacheMap(final String key) {
return redisTemplate.opsForHash().entries(key);
}
/**
* 往Hash中存入数据
*
* @param key Redis键
* @param hKey Hash键
* @param value 值
*/
public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
redisTemplate.opsForHash().put(key, hKey, value);
}
/**
* 获取Hash中的数据
*
* @param key Redis键
* @param hKey Hash键
* @return Hash中的对象
*/
public <T> T getCacheMapValue(final String key, final String hKey) {
HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
return opsForHash.get(key, hKey);
}
/**
* 获取多个Hash中的数据
*
* @param key Redis键
* @param hKeys Hash键集合
* @return Hash对象集合
*/
public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
return redisTemplate.opsForHash().multiGet(key, hKeys);
}
/**
* 删除Hash中的某条数据
*
* @param key Redis键
* @param hKey Hash键
* @return 是否成功
*/
public boolean deleteCacheMapValue(final String key, final String hKey) {
return redisTemplate.opsForHash().delete(key, hKey) > 0;
}
/**
* 获得缓存的基本对象列表
*
* @param pattern 字符串前缀
* @return 对象列表
*/
public Collection<String> keys(final String pattern) {
return redisTemplate.keys(pattern);
}
}

86
ff-bean/ff-domain/pom.xml 100644
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ff</artifactId>
<groupId>com.ff</groupId>
<version>0.0.1</version>
</parent>
<artifactId>ff-domain</artifactId>
<version>0.0.1</version>
<name>ff-domain</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.ff</groupId>
<artifactId>ff-util</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 自定义验证注解 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.15</version>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<finalName>ff-domain</finalName>
</build>
</project>

71
ff-game/src/main/java/com/ff/agent/domain/TenantAgentCommission.java → ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentCommission.java
View File

@ -1,14 +1,15 @@
package com.ff.agent.domain; package com.ff.agent.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 代理佣金管理 对象 ff_tenant_agent_commission * 代理佣金管理 对象 ff_tenant_agent_commission
* *
@ -19,11 +20,12 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentCommission extends BaseEntity public class TenantAgentCommission extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** $column.columnComment */ /**
* $column.columnComment
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ -33,49 +35,60 @@ public class TenantAgentCommission extends BaseEntity
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long agentId; private Long agentId;
/** 来源id */ /**
@Excel(name = "来源id") * 来源id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long sourceId; private Long sourceId;
/** 来源类型 CommissionSourceType */ /**
@Excel(name = "来源类型 CommissionSourceType") * 来源类型 CommissionSourceType
*/
private Integer sourceType; private Integer sourceType;
/** 佣金类型 ff_tenant_agent_commission_type commissionType */ /**
@Excel(name = "佣金类型 commissionType") * 佣金类型 ff_tenant_agent_commission_type commissionType
*/
private Integer commissionType; private Integer commissionType;
/** 币种 */ /**
@Excel(name = "币种") * 币种
*/
private String currencyCode; private String currencyCode;
/** 平台代码 */ /**
@Excel(name = "平台代码") * 平台代码
*/
private String platformCode; private String platformCode;
/** 成本比例 */ /**
@Excel(name = "成本比例") * 成本比例
*/
private BigDecimal costBalance; private BigDecimal costBalance;
/** 商户比例 */ /**
@Excel(name = "商户比例") * 商户比例
*/
private BigDecimal merchantBalance; private BigDecimal merchantBalance;
/** 充值金额 */ /**
@Excel(name = "充值金额") * 充值金额
*/
private BigDecimal balance; private BigDecimal balance;
/** 佣金金额 */ /**
@Excel(name = "佣金金额") * 佣金金额
*/
private BigDecimal commissionBalance; private BigDecimal commissionBalance;
/** USDT金额 */ /**
@Excel(name = "USDT金额") * USDT金额
*/
private BigDecimal usdtBalance; private BigDecimal usdtBalance;
/** 佣金审批状态 ff_tenant_agent_approval_status 0 未提现 1 提现中 2 已提现 */ /**
@Excel(name = "佣金审批状态 0 未提现 1 提现中 1 已提现") * 佣金审批状态 ff_tenant_agent_approval_status 0 未提现 1 提现中 1 已提现
*/
private Integer approvalStatus; private Integer approvalStatus;

63
ff-game/src/main/java/com/ff/agent/domain/TenantAgentInvite.java → ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentInvite.java
View File

@ -1,17 +1,15 @@
package com.ff.agent.domain; package com.ff.agent.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 代理邀请链接对象 ff_tenant_agent_invite * 代理邀请链接对象 ff_tenant_agent_invite
* *
@ -22,53 +20,64 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentInvite extends BaseEntity public class TenantAgentInvite extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 代理id */ /**
@Excel(name = "代理id") * 代理id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long agentId; private Long agentId;
/** 缴费金额 */ /**
@Excel(name = "缴费金额") * 缴费金额
*/
private BigDecimal balance; private BigDecimal balance;
/** 邀请类型 1 租户 2代理 ff_agent_invite_type */ /**
@Excel(name = "邀请类型 1 租户 2代理 ") * 邀请类型 1 租户 2代理 ff_agent_invite_type
*/
private Integer inviteType; private Integer inviteType;
/** 额度类型 TenantQuotaType 枚举 */ /**
@Excel(name = "额度类型 TenantQuotaType 枚举") * 额度类型 TenantQuotaType 枚举
*/
private Integer quotaType; private Integer quotaType;
/** 买分比例 */ /**
@Excel(name = "买分比例") * 买分比例
*/
private BigDecimal scoreRatio; private BigDecimal scoreRatio;
/** 租户类型 TenantType 枚举 */ /**
@Excel(name = "租户类型 TenantType 枚举") * 租户类型 TenantType 枚举
*/
private Integer tenantType; private Integer tenantType;
/** 透支比例 */ /**
@Excel(name = "透支比例") * 透支比例
*/
private BigDecimal depositRatio; private BigDecimal depositRatio;
/** 信誉额度 */ /**
@Excel(name = "信誉额度") * 信誉额度
*/
private BigDecimal realBalance; private BigDecimal realBalance;
/** 邀请码 */ /**
@Excel(name = "邀请码") * 邀请码
*/
private String inviteCode; private String inviteCode;
/** 邀请链接 */ /**
@Excel(name = "邀请链接") * 邀请链接
*/
private String inviteUrl; private String inviteUrl;
} }

38
ff-game/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java → ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java
View File

@ -1,17 +1,15 @@
package com.ff.agent.domain; package com.ff.agent.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 平台邀请注册成本管理对象 ff_tenant_agent_invite_platform * 平台邀请注册成本管理对象 ff_tenant_agent_invite_platform
* *
@ -22,32 +20,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentInvitePlatform extends BaseEntity public class TenantAgentInvitePlatform extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
private Long id; private Long id;
/** 邀请码id */ /**
* 邀请码id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "邀请码id", width = 30, dateFormat = "yyyy-MM-dd")
private Long inviteId; private Long inviteId;
/** 平台编码 */ /**
@Excel(name = "平台编码") * 平台编码
*/
private String platformCode; private String platformCode;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 成本 */ /**
@Excel(name = "成本") * 成本
*/
private BigDecimal cost; private BigDecimal cost;
/** 使用成本 */ /**
@Excel(name = "使用成本") * 使用成本
*/
private BigDecimal useCost; private BigDecimal useCost;

58
ff-game/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java → ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java
View File

@ -1,17 +1,15 @@
package com.ff.agent.domain; package com.ff.agent.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 代理邀请注册对象 ff_tenant_agent_invite_register * 代理邀请注册对象 ff_tenant_agent_invite_register
* *
@ -22,50 +20,60 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentInviteRegister extends BaseEntity public class TenantAgentInviteRegister extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 代理id */ /**
@Excel(name = "代理id") * 代理id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long agentId; private Long agentId;
/** 邀请码 */ /**
@Excel(name = "邀请码") * 邀请码
*/
private String inviteCode; private String inviteCode;
/** 账号 */ /**
@Excel(name = "账号") * 账号
*/
private String account; private String account;
/** 密码 */ /**
@Excel(name = "密码") * 密码
*/
private String password; private String password;
/** 缴费金额 */ /**
@Excel(name = "缴费金额") * 缴费金额
*/
private BigDecimal balance; private BigDecimal balance;
/** 注册时间 */ /**
@Excel(name = "注册时间") * 注册时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long registerTime; private Long registerTime;
/** 注册IP */ /**
@Excel(name = "注册IP") * 注册IP
*/
private String registerIp; private String registerIp;
/** 注册ip的城市 */ /**
@Excel(name = "注册ip的城市") * 注册ip的城市
*/
private String registerIpCity; private String registerIpCity;
/** 状态 1 待激活 2已激活 InviterRegisterStatus 枚举*/ /**
@Excel(name = "状态 1 待激活 2已激活") * 状态 1 待激活 2已激活 InviterRegisterStatus 枚举
*/
private Integer status; private Integer status;
/** /**

33
ff-game/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java → ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java
View File

@ -1,17 +1,15 @@
package com.ff.agent.domain; package com.ff.agent.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 代理申请提现审批管理对象 ff_tenant_agent_withdrawal * 代理申请提现审批管理对象 ff_tenant_agent_withdrawal
* *
@ -22,11 +20,12 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentWithdrawal extends BaseEntity public class TenantAgentWithdrawal extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** $column.columnComment */ /**
* $column.columnComment
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**
@ -35,20 +34,24 @@ public class TenantAgentWithdrawal extends BaseEntity
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long agentId; private Long agentId;
/** 佣金余额 */ /**
@Excel(name = "佣金余额") * 佣金余额
*/
private BigDecimal commissionBalance; private BigDecimal commissionBalance;
/** 币种协议 */ /**
@Excel(name = "币种协议") * 币种协议
*/
private String currencyAgreement; private String currencyAgreement;
/** 钱包地址 */ /**
@Excel(name = "钱包地址") * 钱包地址
*/
private String walletAddress; private String walletAddress;
/** 0 未提现 1 提现中 1 已提现 3 已拒绝 */ /**
@Excel(name = " 0 未提现 1 提现中 1 已提现 3 已拒绝") * 0 未提现 1 提现中 1 已提现 3 已拒绝
*/
private Integer approvalStatus; private Integer approvalStatus;

72
ff-bean/ff-domain/src/main/java/com/ff/agent/mapper/TenantAgentCommissionMapper.java 100644
View File

@ -0,0 +1,72 @@
package com.ff.agent.mapper;
import com.ff.agent.domain.TenantAgentCommission;
import java.math.BigDecimal;
import java.util.List;
/**
* 代理佣金管理 Mapper接口
*
* @author shi
* @date 2025-02-26
*/
public interface TenantAgentCommissionMapper {
/**
* 查询代理佣金管理
*
* @param id 代理佣金管理 主键
* @return 代理佣金管理
*/
TenantAgentCommission selectTenantAgentCommissionById(Long id);
/**
* 查询代理佣金管理 列表
*
* @param tenantAgentCommission 代理佣金管理
* @return 代理佣金管理 集合
*/
List<TenantAgentCommission> selectTenantAgentCommissionList(TenantAgentCommission tenantAgentCommission);
/**
* 新增代理佣金管理
*
* @param tenantAgentCommission 代理佣金管理
* @return 结果
*/
int insertTenantAgentCommission(TenantAgentCommission tenantAgentCommission);
/**
* 修改代理佣金管理
*
* @param tenantAgentCommission 代理佣金管理
* @return 结果
*/
int updateTenantAgentCommission(TenantAgentCommission tenantAgentCommission);
/**
* 删除代理佣金管理
*
* @param id 代理佣金管理 主键
* @return 结果
*/
int deleteTenantAgentCommissionById(Long id);
/**
* 批量删除代理佣金管理
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
int deleteTenantAgentCommissionByIds(Long[] ids);
/**
* 获得代理佣金
*
* @param tenantAgentCommission 租户代理佣金
* @return {@link BigDecimal }
*/
BigDecimal getAgentCommissionSum(TenantAgentCommission tenantAgentCommission);
}

6
ff-game/src/main/java/com/ff/agent/mapper/TenantAgentInviteMapper.java → ff-bean/ff-domain/src/main/java/com/ff/agent/mapper/TenantAgentInviteMapper.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.mapper; package com.ff.agent.mapper;
import java.util.List;
import com.ff.agent.domain.TenantAgentInvite; import com.ff.agent.domain.TenantAgentInvite;
import java.util.List;
/** /**
* 代理邀请链接Mapper接口 * 代理邀请链接Mapper接口
* *
* @author shi * @author shi
* @date 2025-02-25 * @date 2025-02-25
*/ */
public interface TenantAgentInviteMapper public interface TenantAgentInviteMapper {
{
/** /**
* 查询代理邀请链接 * 查询代理邀请链接
* *

6
ff-game/src/main/java/com/ff/agent/mapper/TenantAgentInvitePlatformMapper.java → ff-bean/ff-domain/src/main/java/com/ff/agent/mapper/TenantAgentInvitePlatformMapper.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.mapper; package com.ff.agent.mapper;
import java.util.List;
import com.ff.agent.domain.TenantAgentInvitePlatform; import com.ff.agent.domain.TenantAgentInvitePlatform;
import java.util.List;
/** /**
* 平台邀请注册成本管理Mapper接口 * 平台邀请注册成本管理Mapper接口
* *
* @author shi * @author shi
* @date 2025-02-27 * @date 2025-02-27
*/ */
public interface TenantAgentInvitePlatformMapper public interface TenantAgentInvitePlatformMapper {
{
/** /**
* 查询平台邀请注册成本管理 * 查询平台邀请注册成本管理
* *

62
ff-bean/ff-domain/src/main/java/com/ff/agent/mapper/TenantAgentInviteRegisterMapper.java 100644
View File

@ -0,0 +1,62 @@
package com.ff.agent.mapper;
import com.ff.agent.domain.TenantAgentInviteRegister;
import java.util.List;
/**
* 代理邀请注册Mapper接口
*
* @author shi
* @date 2025-02-25
*/
public interface TenantAgentInviteRegisterMapper {
/**
* 查询代理邀请注册
*
* @param id 代理邀请注册主键
* @return 代理邀请注册
*/
TenantAgentInviteRegister selectTenantAgentInviteRegisterById(Long id);
/**
* 查询代理邀请注册列表
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 代理邀请注册集合
*/
List<TenantAgentInviteRegister> selectTenantAgentInviteRegisterList(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 新增代理邀请注册
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 结果
*/
int insertTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 修改代理邀请注册
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 结果
*/
int updateTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 删除代理邀请注册
*
* @param id 代理邀请注册主键
* @return 结果
*/
int deleteTenantAgentInviteRegisterById(Long id);
/**
* 批量删除代理邀请注册
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
int deleteTenantAgentInviteRegisterByIds(Long[] ids);
}

6
ff-game/src/main/java/com/ff/agent/mapper/TenantAgentWithdrawalMapper.java → ff-bean/ff-domain/src/main/java/com/ff/agent/mapper/TenantAgentWithdrawalMapper.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.mapper; package com.ff.agent.mapper;
import java.util.List;
import com.ff.agent.domain.TenantAgentWithdrawal; import com.ff.agent.domain.TenantAgentWithdrawal;
import java.util.List;
/** /**
* 代理申请提现审批管理Mapper接口 * 代理申请提现审批管理Mapper接口
* *
* @author shi * @author shi
* @date 2025-02-26 * @date 2025-02-26
*/ */
public interface TenantAgentWithdrawalMapper public interface TenantAgentWithdrawalMapper {
{
/** /**
* 查询代理申请提现审批管理 * 查询代理申请提现审批管理
* *

6
ff-game/src/main/java/com/ff/agent/service/ITenantAgentCommissionService.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/ITenantAgentCommissionService.java
View File

@ -1,8 +1,9 @@
package com.ff.agent.service; package com.ff.agent.service;
import com.ff.agent.domain.TenantAgentCommission;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.ff.agent.domain.TenantAgentCommission;
/** /**
* 代理佣金管理 Service接口 * 代理佣金管理 Service接口
@ -10,8 +11,7 @@ import com.ff.agent.domain.TenantAgentCommission;
* @author shi * @author shi
* @date 2025-02-26 * @date 2025-02-26
*/ */
public interface ITenantAgentCommissionService public interface ITenantAgentCommissionService {
{
/** /**
* 查询代理佣金管理 * 查询代理佣金管理
* *

6
ff-game/src/main/java/com/ff/agent/service/ITenantAgentInvitePlatformService.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/ITenantAgentInvitePlatformService.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.service; package com.ff.agent.service;
import java.util.List;
import com.ff.agent.domain.TenantAgentInvitePlatform; import com.ff.agent.domain.TenantAgentInvitePlatform;
import java.util.List;
/** /**
* 平台邀请注册成本管理Service接口 * 平台邀请注册成本管理Service接口
* *
* @author shi * @author shi
* @date 2025-02-27 * @date 2025-02-27
*/ */
public interface ITenantAgentInvitePlatformService public interface ITenantAgentInvitePlatformService {
{
/** /**
* 查询平台邀请注册成本管理 * 查询平台邀请注册成本管理
* *

62
ff-bean/ff-domain/src/main/java/com/ff/agent/service/ITenantAgentInviteRegisterService.java 100644
View File

@ -0,0 +1,62 @@
package com.ff.agent.service;
import com.ff.agent.domain.TenantAgentInviteRegister;
import java.util.List;
/**
* 代理邀请注册Service接口
*
* @author shi
* @date 2025-02-25
*/
public interface ITenantAgentInviteRegisterService {
/**
* 查询代理邀请注册
*
* @param id 代理邀请注册主键
* @return 代理邀请注册
*/
TenantAgentInviteRegister selectTenantAgentInviteRegisterById(Long id);
/**
* 查询代理邀请注册列表
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 代理邀请注册集合
*/
List<TenantAgentInviteRegister> selectTenantAgentInviteRegisterList(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 新增代理邀请注册
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 结果
*/
int insertTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 修改代理邀请注册
*
* @param tenantAgentInviteRegister 代理邀请注册
* @return 结果
*/
int updateTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister);
/**
* 批量删除代理邀请注册
*
* @param ids 需要删除的代理邀请注册主键集合
* @return 结果
*/
int deleteTenantAgentInviteRegisterByIds(Long[] ids);
/**
* 删除代理邀请注册信息
*
* @param id 代理邀请注册主键
* @return 结果
*/
int deleteTenantAgentInviteRegisterById(Long id);
}

13
ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteService.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/ITenantAgentInviteService.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.service; package com.ff.agent.service;
import java.util.List;
import com.ff.agent.domain.TenantAgentInvite; import com.ff.agent.domain.TenantAgentInvite;
import java.util.List;
/** /**
* 代理邀请链接Service接口 * 代理邀请链接Service接口
* *
* @author shi * @author shi
* @date 2025-02-25 * @date 2025-02-25
*/ */
public interface ITenantAgentInviteService public interface ITenantAgentInviteService {
{
/** /**
* 查询代理邀请链接 * 查询代理邀请链接
* *
@ -44,13 +44,6 @@ public interface ITenantAgentInviteService
*/ */
int insertTenantAgentInvite(TenantAgentInvite tenantAgentInvite); int insertTenantAgentInvite(TenantAgentInvite tenantAgentInvite);
/**
* 获取邀请码
*
* @return {@link String }
*/
String getInviteCode();
/** /**
* 修改代理邀请链接 * 修改代理邀请链接
* *

6
ff-game/src/main/java/com/ff/agent/service/ITenantAgentWithdrawalService.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/ITenantAgentWithdrawalService.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.service; package com.ff.agent.service;
import java.util.List;
import com.ff.agent.domain.TenantAgentWithdrawal; import com.ff.agent.domain.TenantAgentWithdrawal;
import java.util.List;
/** /**
* 代理申请提现审批管理Service接口 * 代理申请提现审批管理Service接口
* *
* @author shi * @author shi
* @date 2025-02-26 * @date 2025-02-26
*/ */
public interface ITenantAgentWithdrawalService public interface ITenantAgentWithdrawalService {
{
/** /**
* 查询代理申请提现审批管理 * 查询代理申请提现审批管理
* *

16
ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentCommissionServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/impl/TenantAgentCommissionServiceImpl.java
View File

@ -1,16 +1,16 @@
package com.ff.agent.service.impl; package com.ff.agent.service.impl;
import cn.hutool.core.util.IdUtil;
import com.ff.agent.domain.TenantAgentCommission;
import com.ff.agent.mapper.TenantAgentCommissionMapper;
import com.ff.agent.service.ITenantAgentCommissionService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ff.agent.mapper.TenantAgentCommissionMapper;
import com.ff.agent.domain.TenantAgentCommission;
import com.ff.agent.service.ITenantAgentCommissionService;
/** /**
* 代理佣金管理 Service业务层处理 * 代理佣金管理 Service业务层处理
* *

13
ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInvitePlatformServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/impl/TenantAgentInvitePlatformServiceImpl.java
View File

@ -1,13 +1,14 @@
package com.ff.agent.service.impl; package com.ff.agent.service.impl;
import java.util.List; import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils; import com.ff.agent.domain.TenantAgentInvitePlatform;
import com.ff.agent.mapper.TenantAgentInvitePlatformMapper;
import com.ff.agent.service.ITenantAgentInvitePlatformService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.agent.mapper.TenantAgentInvitePlatformMapper;
import com.ff.agent.domain.TenantAgentInvitePlatform; import java.util.List;
import com.ff.agent.service.ITenantAgentInvitePlatformService;
import cn.hutool.core.util.IdUtil;
/** /**

40
ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteRegisterServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/impl/TenantAgentInviteRegisterServiceImpl.java
View File

@ -1,18 +1,15 @@
package com.ff.agent.service.impl; package com.ff.agent.service.impl;
import java.util.Collections;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.agent.domain.TenantAgentInviteRegister; import com.ff.agent.domain.TenantAgentInviteRegister;
import com.ff.agent.dto.TenantAgentInviteRegisterDTO;
import com.ff.agent.mapper.TenantAgentInviteRegisterMapper; import com.ff.agent.mapper.TenantAgentInviteRegisterMapper;
import com.ff.agent.service.ITenantAgentInviteRegisterService; import com.ff.agent.service.ITenantAgentInviteRegisterService;
import com.ff.base.utils.DateUtils; import com.ff.utils.DateUtils;
import com.ff.base.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 代理邀请注册Service业务层处理 * 代理邀请注册Service业务层处理
* *
@ -20,8 +17,7 @@ import org.springframework.stereotype.Service;
* @date 2025-02-25 * @date 2025-02-25
*/ */
@Service @Service
public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteRegisterService public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteRegisterService {
{
@Autowired @Autowired
private TenantAgentInviteRegisterMapper tenantAgentInviteRegisterMapper; private TenantAgentInviteRegisterMapper tenantAgentInviteRegisterMapper;
@ -32,8 +28,7 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 代理邀请注册 * @return 代理邀请注册
*/ */
@Override @Override
public TenantAgentInviteRegister selectTenantAgentInviteRegisterById(Long id) public TenantAgentInviteRegister selectTenantAgentInviteRegisterById(Long id) {
{
return tenantAgentInviteRegisterMapper.selectTenantAgentInviteRegisterById(id); return tenantAgentInviteRegisterMapper.selectTenantAgentInviteRegisterById(id);
} }
@ -44,21 +39,10 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 代理邀请注册 * @return 代理邀请注册
*/ */
@Override @Override
public List<TenantAgentInviteRegister> selectTenantAgentInviteRegisterList(TenantAgentInviteRegister tenantAgentInviteRegister) public List<TenantAgentInviteRegister> selectTenantAgentInviteRegisterList(TenantAgentInviteRegister tenantAgentInviteRegister) {
{
return tenantAgentInviteRegisterMapper.selectTenantAgentInviteRegisterList(tenantAgentInviteRegister); return tenantAgentInviteRegisterMapper.selectTenantAgentInviteRegisterList(tenantAgentInviteRegister);
} }
/**
* 选择租户代理邀请注册列表dto
*
* @param tenantAgentInviteRegisterDTO 租户代理邀请注册dto
* @return {@link List }<{@link TenantAgentInviteRegisterDTO }>
*/
@Override
public List<TenantAgentInviteRegisterDTO> selectTenantAgentInviteRegisterListDTO(TenantAgentInviteRegisterDTO tenantAgentInviteRegisterDTO) {
return tenantAgentInviteRegisterMapper.selectTenantAgentInviteRegisterListDTO(tenantAgentInviteRegisterDTO);
}
/** /**
* 新增代理邀请注册 * 新增代理邀请注册
@ -67,8 +51,7 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister) public int insertTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister) {
{
tenantAgentInviteRegister.setId(IdUtil.getSnowflakeNextId()); tenantAgentInviteRegister.setId(IdUtil.getSnowflakeNextId());
tenantAgentInviteRegister.setCreateTime(DateUtils.getNowDate()); tenantAgentInviteRegister.setCreateTime(DateUtils.getNowDate());
return tenantAgentInviteRegisterMapper.insertTenantAgentInviteRegister(tenantAgentInviteRegister); return tenantAgentInviteRegisterMapper.insertTenantAgentInviteRegister(tenantAgentInviteRegister);
@ -81,8 +64,7 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister) public int updateTenantAgentInviteRegister(TenantAgentInviteRegister tenantAgentInviteRegister) {
{
tenantAgentInviteRegister.setUpdateTime(DateUtils.getNowDate()); tenantAgentInviteRegister.setUpdateTime(DateUtils.getNowDate());
return tenantAgentInviteRegisterMapper.updateTenantAgentInviteRegister(tenantAgentInviteRegister); return tenantAgentInviteRegisterMapper.updateTenantAgentInviteRegister(tenantAgentInviteRegister);
} }
@ -94,8 +76,7 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentInviteRegisterByIds(Long[] ids) public int deleteTenantAgentInviteRegisterByIds(Long[] ids) {
{
return tenantAgentInviteRegisterMapper.deleteTenantAgentInviteRegisterByIds(ids); return tenantAgentInviteRegisterMapper.deleteTenantAgentInviteRegisterByIds(ids);
} }
@ -106,8 +87,7 @@ public class TenantAgentInviteRegisterServiceImpl implements ITenantAgentInviteR
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentInviteRegisterById(Long id) public int deleteTenantAgentInviteRegisterById(Long id) {
{
return tenantAgentInviteRegisterMapper.deleteTenantAgentInviteRegisterById(id); return tenantAgentInviteRegisterMapper.deleteTenantAgentInviteRegisterById(id);
} }
} }

53
ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/impl/TenantAgentInviteServiceImpl.java
View File

@ -1,16 +1,14 @@
package com.ff.agent.service.impl; package com.ff.agent.service.impl;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils; import com.ff.agent.domain.TenantAgentInvite;
import com.ff.base.utils.NumberUtils; import com.ff.agent.mapper.TenantAgentInviteMapper;
import com.ff.agent.service.ITenantAgentInviteService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.agent.mapper.TenantAgentInviteMapper;
import com.ff.agent.domain.TenantAgentInvite; import java.util.List;
import com.ff.agent.service.ITenantAgentInviteService;
import org.springframework.util.CollectionUtils;
/** /**
* 代理邀请链接Service业务层处理 * 代理邀请链接Service业务层处理
@ -19,8 +17,7 @@ import org.springframework.util.CollectionUtils;
* @date 2025-02-25 * @date 2025-02-25
*/ */
@Service @Service
public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService {
{
@Autowired @Autowired
private TenantAgentInviteMapper tenantAgentInviteMapper; private TenantAgentInviteMapper tenantAgentInviteMapper;
@ -31,8 +28,7 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
* @return 代理邀请链接 * @return 代理邀请链接
*/ */
@Override @Override
public TenantAgentInvite selectTenantAgentInviteById(Long id) public TenantAgentInvite selectTenantAgentInviteById(Long id) {
{
return tenantAgentInviteMapper.selectTenantAgentInviteById(id); return tenantAgentInviteMapper.selectTenantAgentInviteById(id);
} }
@ -44,7 +40,7 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
*/ */
@Override @Override
public TenantAgentInvite selectTenantAgentInviteByInviteCode(String inviteCode) { public TenantAgentInvite selectTenantAgentInviteByInviteCode(String inviteCode) {
return tenantAgentInviteMapper.selectTenantAgentInviteByInviteCode( inviteCode); return tenantAgentInviteMapper.selectTenantAgentInviteByInviteCode(inviteCode);
} }
/** /**
@ -54,8 +50,7 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
* @return 代理邀请链接 * @return 代理邀请链接
*/ */
@Override @Override
public List<TenantAgentInvite> selectTenantAgentInviteList(TenantAgentInvite tenantAgentInvite) public List<TenantAgentInvite> selectTenantAgentInviteList(TenantAgentInvite tenantAgentInvite) {
{
return tenantAgentInviteMapper.selectTenantAgentInviteList(tenantAgentInvite); return tenantAgentInviteMapper.selectTenantAgentInviteList(tenantAgentInvite);
} }
@ -66,38 +61,20 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertTenantAgentInvite(TenantAgentInvite tenantAgentInvite) public int insertTenantAgentInvite(TenantAgentInvite tenantAgentInvite) {
{
tenantAgentInvite.setId(IdUtil.getSnowflakeNextId()); tenantAgentInvite.setId(IdUtil.getSnowflakeNextId());
tenantAgentInvite.setCreateTime(DateUtils.getNowDate()); tenantAgentInvite.setCreateTime(DateUtils.getNowDate());
return tenantAgentInviteMapper.insertTenantAgentInvite(tenantAgentInvite); return tenantAgentInviteMapper.insertTenantAgentInvite(tenantAgentInvite);
} }
/** /**
* 获取邀请码
*
* @return {@link String }
*/
@Override
public synchronized String getInviteCode() {
String inviteCode = NumberUtils.generateRandomCode(12);
while (!CollectionUtils.isEmpty(tenantAgentInviteMapper.selectTenantAgentInviteList(TenantAgentInvite.builder()
.inviteCode(inviteCode)
.build()))) {
inviteCode = NumberUtils.generateRandomCode(12);
}
return inviteCode;
}
/**3
* 修改代理邀请链接 * 修改代理邀请链接
* *
* @param tenantAgentInvite 代理邀请链接 * @param tenantAgentInvite 代理邀请链接
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateTenantAgentInvite(TenantAgentInvite tenantAgentInvite) public int updateTenantAgentInvite(TenantAgentInvite tenantAgentInvite) {
{
tenantAgentInvite.setUpdateTime(DateUtils.getNowDate()); tenantAgentInvite.setUpdateTime(DateUtils.getNowDate());
return tenantAgentInviteMapper.updateTenantAgentInvite(tenantAgentInvite); return tenantAgentInviteMapper.updateTenantAgentInvite(tenantAgentInvite);
} }
@ -109,8 +86,7 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentInviteByIds(Long[] ids) public int deleteTenantAgentInviteByIds(Long[] ids) {
{
return tenantAgentInviteMapper.deleteTenantAgentInviteByIds(ids); return tenantAgentInviteMapper.deleteTenantAgentInviteByIds(ids);
} }
@ -121,8 +97,7 @@ public class TenantAgentInviteServiceImpl implements ITenantAgentInviteService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentInviteById(Long id) public int deleteTenantAgentInviteById(Long id) {
{
return tenantAgentInviteMapper.deleteTenantAgentInviteById(id); return tenantAgentInviteMapper.deleteTenantAgentInviteById(id);
} }
} }

34
ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentWithdrawalServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/agent/service/impl/TenantAgentWithdrawalServiceImpl.java
View File

@ -1,13 +1,14 @@
package com.ff.agent.service.impl; package com.ff.agent.service.impl;
import java.util.List; import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils; import com.ff.agent.domain.TenantAgentWithdrawal;
import com.ff.agent.mapper.TenantAgentWithdrawalMapper;
import com.ff.agent.service.ITenantAgentWithdrawalService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.agent.mapper.TenantAgentWithdrawalMapper;
import com.ff.agent.domain.TenantAgentWithdrawal; import java.util.List;
import com.ff.agent.service.ITenantAgentWithdrawalService;
import cn.hutool.core.util.IdUtil;
/** /**
@ -17,8 +18,7 @@ import cn.hutool.core.util.IdUtil;
* @date 2025-02-26 * @date 2025-02-26
*/ */
@Service @Service
public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalService public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalService {
{
@Autowired @Autowired
private TenantAgentWithdrawalMapper tenantAgentWithdrawalMapper; private TenantAgentWithdrawalMapper tenantAgentWithdrawalMapper;
@ -29,8 +29,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 代理申请提现审批管理 * @return 代理申请提现审批管理
*/ */
@Override @Override
public TenantAgentWithdrawal selectTenantAgentWithdrawalById(Long id) public TenantAgentWithdrawal selectTenantAgentWithdrawalById(Long id) {
{
return tenantAgentWithdrawalMapper.selectTenantAgentWithdrawalById(id); return tenantAgentWithdrawalMapper.selectTenantAgentWithdrawalById(id);
} }
@ -41,8 +40,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 代理申请提现审批管理 * @return 代理申请提现审批管理
*/ */
@Override @Override
public List<TenantAgentWithdrawal> selectTenantAgentWithdrawalList(TenantAgentWithdrawal tenantAgentWithdrawal) public List<TenantAgentWithdrawal> selectTenantAgentWithdrawalList(TenantAgentWithdrawal tenantAgentWithdrawal) {
{
return tenantAgentWithdrawalMapper.selectTenantAgentWithdrawalList(tenantAgentWithdrawal); return tenantAgentWithdrawalMapper.selectTenantAgentWithdrawalList(tenantAgentWithdrawal);
} }
@ -53,8 +51,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertTenantAgentWithdrawal(TenantAgentWithdrawal tenantAgentWithdrawal) public int insertTenantAgentWithdrawal(TenantAgentWithdrawal tenantAgentWithdrawal) {
{
tenantAgentWithdrawal.setId(IdUtil.getSnowflakeNextId()); tenantAgentWithdrawal.setId(IdUtil.getSnowflakeNextId());
tenantAgentWithdrawal.setCreateTime(DateUtils.getNowDate()); tenantAgentWithdrawal.setCreateTime(DateUtils.getNowDate());
return tenantAgentWithdrawalMapper.insertTenantAgentWithdrawal(tenantAgentWithdrawal); return tenantAgentWithdrawalMapper.insertTenantAgentWithdrawal(tenantAgentWithdrawal);
@ -67,8 +64,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateTenantAgentWithdrawal(TenantAgentWithdrawal tenantAgentWithdrawal) public int updateTenantAgentWithdrawal(TenantAgentWithdrawal tenantAgentWithdrawal) {
{
tenantAgentWithdrawal.setUpdateTime(DateUtils.getNowDate()); tenantAgentWithdrawal.setUpdateTime(DateUtils.getNowDate());
return tenantAgentWithdrawalMapper.updateTenantAgentWithdrawal(tenantAgentWithdrawal); return tenantAgentWithdrawalMapper.updateTenantAgentWithdrawal(tenantAgentWithdrawal);
} }
@ -80,8 +76,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentWithdrawalByIds(Long[] ids) public int deleteTenantAgentWithdrawalByIds(Long[] ids) {
{
return tenantAgentWithdrawalMapper.deleteTenantAgentWithdrawalByIds(ids); return tenantAgentWithdrawalMapper.deleteTenantAgentWithdrawalByIds(ids);
} }
@ -92,8 +87,7 @@ public class TenantAgentWithdrawalServiceImpl implements ITenantAgentWithdrawalS
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTenantAgentWithdrawalById(Long id) public int deleteTenantAgentWithdrawalById(Long id) {
{
return tenantAgentWithdrawalMapper.deleteTenantAgentWithdrawalById(id); return tenantAgentWithdrawalMapper.deleteTenantAgentWithdrawalById(id);
} }
} }

39
ff-base/src/main/java/com/ff/base/core/domain/BaseEntity.java → ff-bean/ff-domain/src/main/java/com/ff/base/core/domain/BaseEntity.java
View File

@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -23,8 +22,7 @@ import java.util.Map;
@SuperBuilder @SuperBuilder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class BaseEntity implements Serializable public class BaseEntity implements Serializable {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
@ -32,37 +30,48 @@ public class BaseEntity implements Serializable
*/ */
private Long id; private Long id;
/** 搜索值 */ /**
* 搜索值
*/
@JsonIgnore @JsonIgnore
private String searchValue; private String searchValue;
/** 创建者 */ /**
* 创建者
*/
private String createBy; private String createBy;
/** 创建时间 */ /**
* 创建时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long createTime; private Long createTime;
/** 更新者 */ /**
* 更新者
*/
private String updateBy; private String updateBy;
/** 更新时间 */ /**
* 更新时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long updateTime; private Long updateTime;
/** 备注 */ /**
* 备注
*/
private String remark; private String remark;
/** 请求参数 */ /**
* 请求参数
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params; private Map<String, Object> params;
public Map<String, Object> getParams() {
public Map<String, Object> getParams() if (params == null) {
{
if (params == null)
{
params = new HashMap<>(); params = new HashMap<>();
} }
return params; return params;

63
ff-base/src/main/java/com/ff/base/system/domain/SysConfig.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysConfig.java
View File

@ -2,8 +2,6 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -16,90 +14,85 @@ import javax.validation.constraints.Size;
* *
* @author ff * @author ff
*/ */
public class SysConfig extends BaseEntity public class SysConfig extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 参数主键 */ /**
@Excel(name = "参数主键", cellType = ColumnType.NUMERIC) * 参数主键
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long configId; private Long configId;
/** 参数名称 */ /**
@Excel(name = "参数名称") * 参数名称
*/
private String configName; private String configName;
/** 参数键名 */ /**
@Excel(name = "参数键名") * 参数键名
*/
private String configKey; private String configKey;
/** 参数键值 */ /**
@Excel(name = "参数键值") * 参数键值
*/
private String configValue; private String configValue;
/** 系统内置（Y是 N否） */ /**
@Excel(name = "系统内置", readConverterExp = "Y=是,N=否") * 系统内置（Y是 N否）
*/
private String configType; private String configType;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getConfigId() public Long getConfigId() {
{
return configId; return configId;
} }
public void setConfigId(Long configId) public void setConfigId(Long configId) {
{
this.configId = configId; this.configId = configId;
} }
@NotBlank(message = "参数名称不能为空") @NotBlank(message = "参数名称不能为空")
@Size(min = 0, max = 100, message = "参数名称不能超过100个字符") @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
public String getConfigName() public String getConfigName() {
{
return configName; return configName;
} }
public void setConfigName(String configName) public void setConfigName(String configName) {
{
this.configName = configName; this.configName = configName;
} }
@NotBlank(message = "参数键名长度不能为空") @NotBlank(message = "参数键名长度不能为空")
@Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
public String getConfigKey() public String getConfigKey() {
{
return configKey; return configKey;
} }
public void setConfigKey(String configKey) public void setConfigKey(String configKey) {
{
this.configKey = configKey; this.configKey = configKey;
} }
@NotBlank(message = "参数键值不能为空") @NotBlank(message = "参数键值不能为空")
@Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
public String getConfigValue() public String getConfigValue() {
{
return configValue; return configValue;
} }
public void setConfigValue(String configValue) public void setConfigValue(String configValue) {
{
this.configValue = configValue; this.configValue = configValue;
} }
public String getConfigType() public String getConfigType() {
{
return configType; return configType;
} }
public void setConfigType(String configType) public void setConfigType(String configType) {
{
this.configType = configType; this.configType = configType;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("configId", getConfigId()) .append("configId", getConfigId())
.append("configName", getConfigName()) .append("configName", getConfigName())
.append("configKey", getConfigKey()) .append("configKey", getConfigKey())

8
ff-base/src/main/java/com/ff/base/system/domain/SysDatasource.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysDatasource.java
View File

@ -2,7 +2,6 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
/** /**
@ -21,31 +20,24 @@ public class SysDatasource extends BaseEntity
private Long id; private Long id;
/** 租户id */ /** 租户id */
@Excel(name = "租户id")
private String tenantId; private String tenantId;
/** 连接地址 */ /** 连接地址 */
@Excel(name = "连接地址")
private String url; private String url;
/** 用户名 */ /** 用户名 */
@Excel(name = "用户名")
private String username; private String username;
/** 密码 */ /** 密码 */
@Excel(name = "密码")
private String password; private String password;
/** 数据库驱动 */ /** 数据库驱动 */
@Excel(name = "数据库驱动")
private String driverClassName; private String driverClassName;
/** 时区 */ /** 时区 */
@Excel(name = "时区")
private String timeZone; private String timeZone;
/** 状态（0 停用 1 启用） */ /** 状态（0 停用 1 启用） */
@Excel(name = "状态", readConverterExp = "0=,停=用,1=,启=用")
private String status; private String status;
/** 时区名称 */ /** 时区名称 */

0
ff-base/src/main/java/com/ff/base/system/domain/SysDept.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysDept.java
View File

118
ff-base/src/main/java/com/ff/base/system/domain/SysDictData.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysDictData.java
View File

@ -3,9 +3,6 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.constant.UserConstants;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -18,53 +15,66 @@ import javax.validation.constraints.Size;
* *
* @author ff * @author ff
*/ */
public class SysDictData extends BaseEntity public class SysDictData extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public interface DictDataSimpleView {}; public interface DictDataSimpleView {
/** 字典编码 */ }
@Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
;
/**
* 字典编码
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long dictCode; private Long dictCode;
/** 字典排序 */ /**
@Excel(name = "字典排序", cellType = ColumnType.NUMERIC) * 字典排序
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long dictSort; private Long dictSort;
/** 字典标签 */ /**
@Excel(name = "字典标签") * 字典标签
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String dictLabel; private String dictLabel;
/** 字典键值 */ /**
@Excel(name = "字典键值") * 字典键值
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String dictValue; private String dictValue;
/** 字典类型 */ /**
@Excel(name = "字典类型") * 字典类型
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String dictType; private String dictType;
/** 样式属性（其他样式扩展） */ /**
* 样式属性（其他样式扩展）
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String cssClass; private String cssClass;
/** 表格字典样式 */ /**
* 表格字典样式
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String listClass; private String listClass;
/** 是否默认（Y是 N否） */ /**
@Excel(name = "是否默认", readConverterExp = "Y=是,N=否") * 是否默认（Y是 N否）
*/
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String isDefault; private String isDefault;
/** 状态（0正常 1停用） */ /**
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") * 状态（0正常 1停用）
*/
private String status; private String status;
@Override @Override
@ -76,114 +86,98 @@ public class SysDictData extends BaseEntity
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
@JsonView(DictDataSimpleView.class) @JsonView(DictDataSimpleView.class)
private String remark; private String remark;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getDictCode() public Long getDictCode() {
{
return dictCode; return dictCode;
} }
public void setDictCode(Long dictCode) public void setDictCode(Long dictCode) {
{
this.dictCode = dictCode; this.dictCode = dictCode;
} }
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getDictSort() public Long getDictSort() {
{
return dictSort; return dictSort;
} }
public void setDictSort(Long dictSort) public void setDictSort(Long dictSort) {
{
this.dictSort = dictSort; this.dictSort = dictSort;
} }
@NotBlank(message = "字典标签不能为空") @NotBlank(message = "字典标签不能为空")
@Size(min = 0, max = 200, message = "字典标签长度不能超过200个字符") @Size(min = 0, max = 200, message = "字典标签长度不能超过200个字符")
public String getDictLabel() public String getDictLabel() {
{
return dictLabel; return dictLabel;
} }
public void setDictLabel(String dictLabel) public void setDictLabel(String dictLabel) {
{
this.dictLabel = dictLabel; this.dictLabel = dictLabel;
} }
@NotBlank(message = "字典键值不能为空") @NotBlank(message = "字典键值不能为空")
@Size(min = 0, max = 200, message = "字典键值长度不能超过200个字符") @Size(min = 0, max = 200, message = "字典键值长度不能超过200个字符")
public String getDictValue() public String getDictValue() {
{
return dictValue; return dictValue;
} }
public void setDictValue(String dictValue) public void setDictValue(String dictValue) {
{
this.dictValue = dictValue; this.dictValue = dictValue;
} }
@NotBlank(message = "字典类型不能为空") @NotBlank(message = "字典类型不能为空")
@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
public String getDictType() public String getDictType() {
{
return dictType; return dictType;
} }
public void setDictType(String dictType) public void setDictType(String dictType) {
{
this.dictType = dictType; this.dictType = dictType;
} }
@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
public String getCssClass() public String getCssClass() {
{
return cssClass; return cssClass;
} }
public void setCssClass(String cssClass) public void setCssClass(String cssClass) {
{
this.cssClass = cssClass; this.cssClass = cssClass;
} }
public String getListClass() public String getListClass() {
{
return listClass; return listClass;
} }
public void setListClass(String listClass) public void setListClass(String listClass) {
{
this.listClass = listClass; this.listClass = listClass;
} }
public boolean getDefault() public boolean getDefault() {
{ return "Y".equals(this.isDefault);
return UserConstants.YES.equals(this.isDefault);
} }
public String getIsDefault() public String getIsDefault() {
{
return isDefault; return isDefault;
} }
public void setIsDefault(String isDefault) public void setIsDefault(String isDefault) {
{
this.isDefault = isDefault; this.isDefault = isDefault;
} }
public String getStatus() public String getStatus() {
{
return status; return status;
} }
public void setStatus(String status) public void setStatus(String status) {
{
this.status = status; this.status = status;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("dictCode", getDictCode()) .append("dictCode", getDictCode())
.append("dictSort", getDictSort()) .append("dictSort", getDictSort())
.append("dictLabel", getDictLabel()) .append("dictLabel", getDictLabel())

52
ff-base/src/main/java/com/ff/base/system/domain/SysDictType.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysDictType.java
View File

@ -2,8 +2,6 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -17,75 +15,71 @@ import javax.validation.constraints.Size;
* *
* @author ff * @author ff
*/ */
public class SysDictType extends BaseEntity public class SysDictType extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 字典主键 */ /**
@Excel(name = "字典主键", cellType = ColumnType.NUMERIC) * 字典主键
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long dictId; private Long dictId;
/** 字典名称 */ /**
@Excel(name = "字典名称") * 字典名称
*/
private String dictName; private String dictName;
/** 字典类型 */ /**
@Excel(name = "字典类型") * 字典类型
*/
private String dictType; private String dictType;
/** 状态（0正常 1停用） */ /**
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") * 状态（0正常 1停用）
*/
private String status; private String status;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getDictId() public Long getDictId() {
{
return dictId; return dictId;
} }
public void setDictId(Long dictId) public void setDictId(Long dictId) {
{
this.dictId = dictId; this.dictId = dictId;
} }
@NotBlank(message = "字典名称不能为空") @NotBlank(message = "字典名称不能为空")
@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
public String getDictName() public String getDictName() {
{
return dictName; return dictName;
} }
public void setDictName(String dictName) public void setDictName(String dictName) {
{
this.dictName = dictName; this.dictName = dictName;
} }
@NotBlank(message = "字典类型不能为空") @NotBlank(message = "字典类型不能为空")
@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
@Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
public String getDictType() public String getDictType() {
{
return dictType; return dictType;
} }
public void setDictType(String dictType) public void setDictType(String dictType) {
{
this.dictType = dictType; this.dictType = dictType;
} }
public String getStatus() public String getStatus() {
{
return status; return status;
} }
public void setStatus(String status) public void setStatus(String status) {
{
this.status = status; this.status = status;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("dictId", getDictId()) .append("dictId", getDictId())
.append("dictName", getDictName()) .append("dictName", getDictName())
.append("dictType", getDictType()) .append("dictType", getDictType())

134
ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysLogininfor.java 100644
View File

@ -0,0 +1,134 @@
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;
}
}

279
ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysMenu.java 100644
View File

@ -0,0 +1,279 @@
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<SysMenu> children = new ArrayList<SysMenu>();
@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<SysMenu> getChildren() {
return children;
}
public void setChildren(List<SysMenu> 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();
}
}

110
ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysOperLog.java 100644
View File

@ -0,0 +1,110 @@
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;
}

73
ff-base/src/main/java/com/ff/base/system/domain/SysPost.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysPost.java
View File

@ -2,8 +2,6 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -17,102 +15,97 @@ import javax.validation.constraints.Size;
* *
* @author ff * @author ff
*/ */
public class SysPost extends BaseEntity public class SysPost extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 岗位序号 */ /**
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) * 岗位序号
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long postId; private Long postId;
/** 岗位编码 */ /**
@Excel(name = "岗位编码") * 岗位编码
*/
private String postCode; private String postCode;
/** 岗位名称 */ /**
@Excel(name = "岗位名称") * 岗位名称
*/
private String postName; private String postName;
/** 岗位排序 */ /**
@Excel(name = "岗位排序") * 岗位排序
*/
private Integer postSort; private Integer postSort;
/** 状态（0正常 1停用） */ /**
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") * 状态（0正常 1停用）
*/
private String status; private String status;
/** 用户是否存在此岗位标识 默认不存在 */ /**
* 用户是否存在此岗位标识 默认不存在
*/
private boolean flag = false; private boolean flag = false;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getPostId() public Long getPostId() {
{
return postId; return postId;
} }
public void setPostId(Long postId) public void setPostId(Long postId) {
{
this.postId = postId; this.postId = postId;
} }
@NotBlank(message = "岗位编码不能为空") @NotBlank(message = "岗位编码不能为空")
@Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
public String getPostCode() public String getPostCode() {
{
return postCode; return postCode;
} }
public void setPostCode(String postCode) public void setPostCode(String postCode) {
{
this.postCode = postCode; this.postCode = postCode;
} }
@NotBlank(message = "岗位名称不能为空") @NotBlank(message = "岗位名称不能为空")
@Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
public String getPostName() public String getPostName() {
{
return postName; return postName;
} }
public void setPostName(String postName) public void setPostName(String postName) {
{
this.postName = postName; this.postName = postName;
} }
@NotNull(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
public Integer getPostSort() public Integer getPostSort() {
{
return postSort; return postSort;
} }
public void setPostSort(Integer postSort) public void setPostSort(Integer postSort) {
{
this.postSort = postSort; this.postSort = postSort;
} }
public String getStatus() public String getStatus() {
{
return status; return status;
} }
public void setStatus(String status) public void setStatus(String status) {
{
this.status = status; this.status = status;
} }
public boolean isFlag() public boolean isFlag() {
{
return flag; return flag;
} }
public void setFlag(boolean flag) public void setFlag(boolean flag) {
{
this.flag = flag; this.flag = flag;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("postId", getPostId()) .append("postId", getPostId())
.append("postCode", getPostCode()) .append("postCode", getPostCode())
.append("postName", getPostName()) .append("postName", getPostName())

233
ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysRole.java 100644
View File

@ -0,0 +1,233 @@
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<String> 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<String> getPermissions() {
return permissions;
}
public void setPermissions(Set<String> 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();
}
}

27
ff-base/src/main/java/com/ff/base/system/domain/SysRoleDept.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysRoleDept.java
View File

@ -10,39 +10,40 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* *
* @author ff * @author ff
*/ */
public class SysRoleDept public class SysRoleDept {
{ /**
/** 角色ID */ * 角色ID
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long roleId; private Long roleId;
/** 部门ID */ /**
* 部门ID
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long deptId; private Long deptId;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getRoleId() public Long getRoleId() {
{
return roleId; return roleId;
} }
public void setRoleId(Long roleId) public void setRoleId(Long roleId) {
{
this.roleId = roleId; this.roleId = roleId;
} }
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getDeptId() public Long getDeptId() {
{
return deptId; return deptId;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId) {
{
this.deptId = deptId; this.deptId = deptId;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId()) .append("roleId", getRoleId())
.append("deptId", getDeptId()) .append("deptId", getDeptId())
.toString(); .toString();

27
ff-base/src/main/java/com/ff/base/system/domain/SysRoleMenu.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysRoleMenu.java
View File

@ -10,39 +10,40 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* *
* @author ff * @author ff
*/ */
public class SysRoleMenu public class SysRoleMenu {
{ /**
/** 角色ID */ * 角色ID
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long roleId; private Long roleId;
/** 菜单ID */ /**
* 菜单ID
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long menuId; private Long menuId;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getRoleId() public Long getRoleId() {
{
return roleId; return roleId;
} }
public void setRoleId(Long roleId) public void setRoleId(Long roleId) {
{
this.roleId = roleId; this.roleId = roleId;
} }
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long getMenuId() public Long getMenuId() {
{
return menuId; return menuId;
} }
public void setMenuId(Long menuId) public void setMenuId(Long menuId) {
{
this.menuId = menuId; this.menuId = menuId;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId()) .append("roleId", getRoleId())
.append("menuId", getMenuId()) .append("menuId", getMenuId())
.toString(); .toString();

29
ff-base/src/main/java/com/ff/base/system/domain/SysUser.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysUser.java
View File

@ -2,15 +2,8 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.annotation.Excel.ColumnType;
import com.ff.base.annotation.Excel.Type;
import com.ff.base.annotation.Excels;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import com.ff.base.xss.Xss;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@ -30,21 +23,17 @@ public class SysUser extends BaseEntity {
* 用户ID * 用户ID
*/ */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId; private Long userId;
/** /**
* 部门ID * 部门ID
*/ */
@Excel(name = "部门编号", type = Type.IMPORT)
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long deptId; private Long deptId;
/** /**
* 用户账号 * 用户账号
*/ */
@Excel(name = "登录名称")
@Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空") @NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
private String userName; private String userName;
@ -52,15 +41,12 @@ public class SysUser extends BaseEntity {
/** /**
* 用户昵称 * 用户昵称
*/ */
@Excel(name = "用户名称")
@Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
private String nickName; private String nickName;
/** /**
* 用户邮箱 * 用户邮箱
*/ */
@Excel(name = "用户邮箱")
@Email(message = "邮箱格式不正确") @Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
private String email; private String email;
@ -68,14 +54,12 @@ public class SysUser extends BaseEntity {
/** /**
* 手机号码 * 手机号码
*/ */
@Excel(name = "手机号码", cellType = ColumnType.TEXT)
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
private String phonenumber; private String phonenumber;
/** /**
* 用户性别 * 用户性别
*/ */
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
private String sex; private String sex;
/** /**
@ -91,7 +75,6 @@ public class SysUser extends BaseEntity {
/** /**
* 帐号状态（0正常 1停用） * 帐号状态（0正常 1停用）
*/ */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** /**
@ -102,23 +85,17 @@ public class SysUser extends BaseEntity {
/** /**
* 最后登录IP * 最后登录IP
*/ */
@Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp; private String loginIp;
/** /**
* 最后登录时间 * 最后登录时间
*/ */
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long loginDate; private Long loginDate;
/** /**
* 部门对象 * 部门对象
*/ */
@Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
})
private SysDept dept; private SysDept dept;
/** /**
@ -148,18 +125,12 @@ public class SysUser extends BaseEntity {
private Integer loginType; private Integer loginType;
/** /**
* 真实姓名 * 真实姓名
*/ */
private String realName; private String realName;
public SysUser() { public SysUser() {
} }

112
ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysUserOnline.java 100644
View File

@ -0,0 +1,112 @@
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;
}
}

25
ff-base/src/main/java/com/ff/base/system/domain/SysUserPost.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysUserPost.java
View File

@ -8,37 +8,36 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* *
* @author ff * @author ff
*/ */
public class SysUserPost public class SysUserPost {
{ /**
/** 用户ID */ * 用户ID
*/
private Long userId; private Long userId;
/** 岗位ID */ /**
* 岗位ID
*/
private Long postId; private Long postId;
public Long getUserId() public Long getUserId() {
{
return userId; return userId;
} }
public void setUserId(Long userId) public void setUserId(Long userId) {
{
this.userId = userId; this.userId = userId;
} }
public Long getPostId() public Long getPostId() {
{
return postId; return postId;
} }
public void setPostId(Long postId) public void setPostId(Long postId) {
{
this.postId = postId; this.postId = postId;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId()) .append("userId", getUserId())
.append("postId", getPostId()) .append("postId", getPostId())
.toString(); .toString();

25
ff-base/src/main/java/com/ff/base/system/domain/SysUserRole.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/SysUserRole.java
View File

@ -8,37 +8,36 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* *
* @author ff * @author ff
*/ */
public class SysUserRole public class SysUserRole {
{ /**
/** 用户ID */ * 用户ID
*/
private Long userId; private Long userId;
/** 角色ID */ /**
* 角色ID
*/
private Long roleId; private Long roleId;
public Long getUserId() public Long getUserId() {
{
return userId; return userId;
} }
public void setUserId(Long userId) public void setUserId(Long userId) {
{
this.userId = userId; this.userId = userId;
} }
public Long getRoleId() public Long getRoleId() {
{
return roleId; return roleId;
} }
public void setRoleId(Long roleId) public void setRoleId(Long roleId) {
{
this.roleId = roleId; this.roleId = roleId;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId()) .append("userId", getUserId())
.append("roleId", getRoleId()) .append("roleId", getRoleId())
.toString(); .toString();

50
ff-base/src/main/java/com/ff/base/system/domain/TenantAgent.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/TenantAgent.java
View File

@ -2,10 +2,8 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -20,50 +18,58 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgent extends BaseEntity public class TenantAgent extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 账号 */ /**
@Excel(name = "账号") * 账号
*/
private String account; private String account;
/** 密码 */ /**
@Excel(name = "密码") * 密码
*/
private String password; private String password;
/** 注册时间 */ /**
@Excel(name = "注册时间") * 注册时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long registerTime; private Long registerTime;
/** 注册IP */ /**
@Excel(name = "注册IP") * 注册IP
*/
private String registerIp; private String registerIp;
/** 注册ip的城市 */ /**
@Excel(name = "注册ip的城市") * 注册ip的城市
*/
private String registerIpCity; private String registerIpCity;
/** 最后登录ip */ /**
@Excel(name = "最后登录ip") * 最后登录ip
*/
private String loginIp; private String loginIp;
/** 最后登录时间 */ /**
@Excel(name = "最后登录时间") * 最后登录时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long loginData; private Long loginData;
/** 租户状态 1正常 0停用 */ /**
@Excel(name = "租户状态 1正常 0停用") * 租户状态 1正常 0停用
*/
private Boolean tenantStatus; private Boolean tenantStatus;
/** /**
* 货币协议 * 货币协议
*/ */

38
ff-base/src/main/java/com/ff/base/system/domain/TenantPlatform.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/TenantPlatform.java
View File

@ -1,17 +1,15 @@
package com.ff.base.system.domain; package com.ff.base.system.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 租户成本管理对象 ff_tenant_platform * 租户成本管理对象 ff_tenant_platform
* *
@ -22,32 +20,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantPlatform extends BaseEntity public class TenantPlatform extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
private Long id; private Long id;
/** 租户id */ /**
* 租户id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "租户id", width = 30, dateFormat = "yyyy-MM-dd")
private Long tenantId; private Long tenantId;
/** 平台编码 */ /**
@Excel(name = "平台编码") * 平台编码
*/
private String platformCode; private String platformCode;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 成本 */ /**
@Excel(name = "成本") * 成本
*/
private BigDecimal cost; private BigDecimal cost;
/** 使用成本 */ /**
@Excel(name = "使用成本") * 使用成本
*/
private BigDecimal useCost; private BigDecimal useCost;

88
ff-base/src/main/java/com/ff/base/system/domain/TenantSecretKey.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/TenantSecretKey.java
View File

@ -1,18 +1,16 @@
package com.ff.base.system.domain; package com.ff.base.system.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 用户租户密钥对象 ff_tenant_secret_key * 用户租户密钥对象 ff_tenant_secret_key
* *
@ -23,76 +21,92 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantSecretKey extends BaseEntity public class TenantSecretKey extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 租户key */ /**
@Excel(name = "租户key") * 租户key
*/
private String tenantKey; private String tenantKey;
/** 密码 */ /**
@Excel(name = "密码") * 密码
*/
@JsonIgnore @JsonIgnore
private String password; private String password;
/** 注册时间 */ /**
* 注册时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "注册时间")
private Long registerTime; private Long registerTime;
/** 注册ip */ /**
@Excel(name = "注册ip") * 注册ip
*/
private String registerIp; private String registerIp;
/** 注册ip的城市 */ /**
@Excel(name = "注册ip的城市") * 注册ip的城市
*/
private String registerIpCity; private String registerIpCity;
/** 最后登录ip */ /**
@Excel(name = "最后登录ip") * 最后登录ip
*/
private String loginIp; private String loginIp;
/** 最后登录时间 */ /**
* 最后登录时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "最后登录时间")
private Long loginData; private Long loginData;
/** 上级代理id */ /**
* 上级代理id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "上级代理id")
private Long agentId; private Long agentId;
/** 商户后缀 */ /**
@Excel(name = "商户后缀") * 商户后缀
*/
private String tenantSn; private String tenantSn;
/** 租户密钥 */ /**
@Excel(name = "租户密钥") * 租户密钥
*/
private String tenantSecret; private String tenantSecret;
/** 租户状态 1正常 0停用 */ /**
@Excel(name = "租户状态 1正常 0停用") * 租户状态 1正常 0停用
*/
private Boolean tenantStatus; private Boolean tenantStatus;
/** 额度类型 TenantQuotaType 枚举 */ /**
@Excel(name = "额度类型 TenantQuotaType 枚举") * 额度类型 TenantQuotaType 枚举
*/
private Integer quotaType; private Integer quotaType;
/** 买分比例 */ /**
@Excel(name = "买分比例") * 买分比例
*/
private BigDecimal scoreRatio; private BigDecimal scoreRatio;
/** 租户类型 TenantType 枚举 */ /**
@Excel(name = "租户类型 TenantType 枚举") * 租户类型 TenantType 枚举
*/
private Integer tenantType; private Integer tenantType;
/** 透支比例 */ /**
@Excel(name = "透支比例") * 透支比例
*/
private BigDecimal depositRatio; private BigDecimal depositRatio;

19
ff-base/src/main/java/com/ff/base/system/domain/TenantWhite.java → ff-bean/ff-domain/src/main/java/com/ff/base/system/domain/TenantWhite.java
View File

@ -2,10 +2,8 @@ package com.ff.base.system.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -20,20 +18,23 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantWhite extends BaseEntity public class TenantWhite extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
private Long id; private Long id;
/** 租户id */ /**
* 租户id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Excel(name = "租户id", width = 30, dateFormat = "yyyy-MM-dd")
private Long tenantId; private Long tenantId;
/** 白名单ip地址 */ /**
@Excel(name = "白名单ip地址") * 白名单ip地址
*/
private String whiteIp; private String whiteIp;

53
ff-game/src/main/java/com/ff/common/domain/Currency.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/Currency.java
View File

@ -1,12 +1,12 @@
package com.ff.common.domain; package com.ff.common.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* 币种对象 ff_currency * 币种对象 ff_currency
* *
@ -14,44 +14,53 @@ import lombok.Data;
* @date 2025-02-10 * @date 2025-02-10
*/ */
@Data @Data
public class Currency extends BaseEntity public class Currency extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 币种状态（0正常 1停用） */ /**
@Excel(name = "币种状态", readConverterExp = "0=正常,1=停用") * 币种状态（0正常 1停用）
*/
private String status; private String status;
/** 币种国家 */ /**
@Excel(name = "币种国家") * 币种国家
*/
private String country; private String country;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 币种符号 */ /**
@Excel(name = "币种符号") * 币种符号
*/
private String currencySign; private String currencySign;
/** 汇率 */ /**
@Excel(name = "汇率") * 汇率
*/
private BigDecimal gameRate; private BigDecimal gameRate;
/** 币种展示内容 */ /**
@Excel(name = "币种展示内容") * 币种展示内容
*/
private String currencyDisplay; private String currencyDisplay;
/** 币种名称 */ /**
@Excel(name = "币种名称") * 币种名称
*/
private String currencyName; private String currencyName;
/** 币种全称 */ /**
@Excel(name = "币种全称") * 币种全称
*/
private String fullName; private String fullName;

29
ff-game/src/main/java/com/ff/common/domain/Lang.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/Lang.java
View File

@ -2,9 +2,9 @@ package com.ff.common.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
/** /**
* 系统语种管理 对象 ff_lang * 系统语种管理 对象 ff_lang
* *
@ -12,28 +12,33 @@ import lombok.Data;
* @date 2025-02-10 * @date 2025-02-10
*/ */
@Data @Data
public class Lang extends BaseEntity public class Lang extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 语言名称 */ /**
@Excel(name = "语言名称") * 语言名称
*/
private String name; private String name;
/** 国家代码 */ /**
@Excel(name = "国家代码") * 国家代码
*/
private String country; private String country;
/** 语种 */ /**
@Excel(name = "语种") * 语种
*/
private String langCode; private String langCode;
/** 语种开关 0 关闭 1 开启 */ /**
@Excel(name = "语种开关 0 关闭 1 开启") * 语种开关 0 关闭 1 开启
*/
private Boolean langStatus; private Boolean langStatus;

32
ff-game/src/main/java/com/ff/common/domain/TenantAgentPlatform.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/TenantAgentPlatform.java
View File

@ -1,14 +1,13 @@
package com.ff.common.domain; package com.ff.common.domain;
import java.math.BigDecimal;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 平台利润成本管理对象 ff_tenant_agent_platform * 平台利润成本管理对象 ff_tenant_agent_platform
* *
@ -19,27 +18,32 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantAgentPlatform extends BaseEntity public class TenantAgentPlatform extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
private Long id; private Long id;
/** 平台编码 */ /**
@Excel(name = "平台编码") * 平台编码
*/
private String platformCode; private String platformCode;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 成本 */ /**
@Excel(name = "成本") * 成本
*/
private BigDecimal cost; private BigDecimal cost;
/** 使用成本 */ /**
@Excel(name = "使用成本") * 使用成本
*/
private BigDecimal useCost; private BigDecimal useCost;

34
ff-game/src/main/java/com/ff/common/domain/TenantGameQuota.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/TenantGameQuota.java
View File

@ -1,18 +1,15 @@
package com.ff.common.domain; package com.ff.common.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 租户游戏配额对象 ff_tenant_game_quota * 租户游戏配额对象 ff_tenant_game_quota
* *
@ -23,28 +20,33 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantGameQuota extends BaseEntity public class TenantGameQuota extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 租户key */ /**
@Excel(name = "租户key") * 租户key
*/
private String tenantKey; private String tenantKey;
/** 游戏额度 */ /**
@Excel(name = "游戏额度") * 游戏额度
*/
private BigDecimal balance; private BigDecimal balance;
/** 额度类型 TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度 */ /**
@Excel(name = "额度类型 TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度") * 额度类型 TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度
*/
private String quotaType; private String quotaType;
/** 版本号 */ /**
@Excel(name = "版本号") * 版本号
*/
private Integer version; private Integer version;

74
ff-game/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java
View File

@ -1,17 +1,15 @@
package com.ff.common.domain; package com.ff.common.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 租户游戏额度流水对象 ff_tenant_game_quota_flow * 租户游戏额度流水对象 ff_tenant_game_quota_flow
* *
@ -22,65 +20,77 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantGameQuotaFlow extends BaseEntity public class TenantGameQuotaFlow extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 租户key */ /**
@Excel(name = "租户key") * 租户key
*/
private String tenantKey; private String tenantKey;
/** 额度类型 */ /**
@Excel(name = "额度类型") * 额度类型
*/
private String quotaType; private String quotaType;
/** 用户账号id */ /**
@Excel(name = "用户账号id") * 用户账号id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long memberId; private Long memberId;
/** 平台 */ /**
@Excel(name = "平台") * 平台
*/
private String platformCode; private String platformCode;
/** 币种代码 */ /**
@Excel(name = "币种代码") * 币种代码
*/
private String currencyCode; private String currencyCode;
/**
/** 充值类型 false 扣除 true 充值 */ * 充值类型 false 扣除 true 充值
@Excel(name = "充值类型 false 扣除 true 充值") */
private Boolean isOut; private Boolean isOut;
/** 操作类型 operationType枚举 */ /**
@Excel(name = "操作类型 operationType枚举") * 操作类型 operationType枚举
*/
private Integer operationType; private Integer operationType;
/** 游戏额度之前 */ /**
@Excel(name = "游戏额度之前") * 游戏额度之前
*/
private BigDecimal balanceBefore; private BigDecimal balanceBefore;
/** 游戏额度 */ /**
@Excel(name = "游戏额度") * 游戏额度
*/
private BigDecimal balance; private BigDecimal balance;
/** 兑换比例 */ /**
@Excel(name = "兑换比例") * 兑换比例
*/
private BigDecimal exchangeRatio; private BigDecimal exchangeRatio;
/** 兑换金额 */ /**
@Excel(name = "兑换金额") * 兑换金额
*/
private BigDecimal exchangeMoney; private BigDecimal exchangeMoney;
/** 游戏额度之后 */ /**
@Excel(name = "游戏额度之后") * 游戏额度之后
*/
private BigDecimal balanceAfter; private BigDecimal balanceAfter;
/** /**

43
ff-game/src/main/java/com/ff/common/domain/TenantQuotaExchange.java → ff-bean/ff-domain/src/main/java/com/ff/common/domain/TenantQuotaExchange.java
View File

@ -1,17 +1,15 @@
package com.ff.common.domain; package com.ff.common.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 币种汇率对象 ff_tenant_quota_exchange * 币种汇率对象 ff_tenant_quota_exchange
* *
@ -22,36 +20,43 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantQuotaExchange extends BaseEntity public class TenantQuotaExchange extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 兑换币种编码 */ /**
@Excel(name = "兑换币种编码") * 兑换币种编码
*/
private String exchangeCurrencyCode; private String exchangeCurrencyCode;
/** 市场兑换金额 */ /**
@Excel(name = "市场兑换金额") * 市场兑换金额
*/
private BigDecimal exchangeRate; private BigDecimal exchangeRate;
/** 汇率差 1百分比 2 固定值 */ /**
@Excel(name = "汇率差 1百分比 2 固定值") * 汇率差 1百分比 2 固定值
*/
private Integer differenceType; private Integer differenceType;
/** 汇率差值 */ /**
@Excel(name = "汇率差值") * 汇率差值
*/
private BigDecimal differenceValue; private BigDecimal differenceValue;
/** 实际兑换金额 */ /**
@Excel(name = "实际兑换金额") * 实际兑换金额
*/
private BigDecimal actualBalance; private BigDecimal actualBalance;

3
ff-game/src/main/java/com/ff/common/mapper/CurrencyMapper.java → ff-bean/ff-domain/src/main/java/com/ff/common/mapper/CurrencyMapper.java
View File

@ -1,8 +1,9 @@
package com.ff.common.mapper; package com.ff.common.mapper;
import java.util.List;
import com.ff.common.domain.Currency; import com.ff.common.domain.Currency;
import java.util.List;
/** /**
* 币种Mapper接口 * 币种Mapper接口
* *

3
ff-game/src/main/java/com/ff/common/mapper/LangMapper.java → ff-bean/ff-domain/src/main/java/com/ff/common/mapper/LangMapper.java
View File

@ -1,8 +1,9 @@
package com.ff.common.mapper; package com.ff.common.mapper;
import java.util.List;
import com.ff.common.domain.Lang; import com.ff.common.domain.Lang;
import java.util.List;
/** /**
* 系统语种管理 Mapper接口 * 系统语种管理 Mapper接口
* *

62
ff-bean/ff-domain/src/main/java/com/ff/common/service/ICurrencyService.java 100644
View File

@ -0,0 +1,62 @@
package com.ff.common.service;
import com.ff.common.domain.Currency;
import java.util.List;
/**
* 币种Service接口
*
* @author shi
* @date 2025-02-10
*/
public interface ICurrencyService
{
/**
* 查询币种
*
* @param id 币种主键
* @return 币种
*/
Currency selectCurrencyById(Long id);
/**
* 查询币种列表
*
* @param currency 币种
* @return 币种集合
*/
List<Currency> selectCurrencyList(Currency currency);
/**
* 新增币种
*
* @param currency 币种
* @return 结果
*/
int insertCurrency(Currency currency);
/**
* 修改币种
*
* @param currency 币种
* @return 结果
*/
int updateCurrency(Currency currency);
/**
* 批量删除币种
*
* @param ids 需要删除的币种主键集合
* @return 结果
*/
int deleteCurrencyByIds(Long[] ids);
/**
* 删除币种信息
*
* @param id 币种主键
* @return 结果
*/
int deleteCurrencyById(Long id);
}

62
ff-bean/ff-domain/src/main/java/com/ff/common/service/ILangService.java 100644
View File

@ -0,0 +1,62 @@
package com.ff.common.service;
import com.ff.common.domain.Lang;
import java.util.List;
/**
* 系统语种管理 Service接口
*
* @author shi
* @date 2025-02-10
*/
public interface ILangService
{
/**
* 查询系统语种管理
*
* @param id 系统语种管理 主键
* @return 系统语种管理
*/
Lang selectLangById(Long id);
/**
* 查询系统语种管理 列表
*
* @param lang 系统语种管理
* @return 系统语种管理 集合
*/
List<Lang> selectLangList(Lang lang);
/**
* 新增系统语种管理
*
* @param lang 系统语种管理
* @return 结果
*/
int insertLang(Lang lang);
/**
* 修改系统语种管理
*
* @param lang 系统语种管理
* @return 结果
*/
int updateLang(Lang lang);
/**
* 批量删除系统语种管理
*
* @param ids 需要删除的系统语种管理 主键集合
* @return 结果
*/
int deleteLangByIds(Long[] ids);
/**
* 删除系统语种管理 信息
*
* @param id 系统语种管理 主键
* @return 结果
*/
int deleteLangById(Long id);
}

99
ff-bean/ff-domain/src/main/java/com/ff/common/service/impl/CurrencyServiceImpl.java 100644
View File

@ -0,0 +1,99 @@
package com.ff.common.service.impl;
import cn.hutool.core.util.IdUtil;
import com.ff.common.domain.Currency;
import com.ff.common.mapper.CurrencyMapper;
import com.ff.common.service.ICurrencyService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 币种Service业务层处理
*
* @author shi
* @date 2025-02-10
*/
@Service
public class CurrencyServiceImpl implements ICurrencyService
{
@Autowired
private CurrencyMapper currencyMapper;
/**
* 查询币种
*
* @param id 币种主键
* @return 币种
*/
@Override
public Currency selectCurrencyById(Long id)
{
return currencyMapper.selectCurrencyById(id);
}
/**
* 查询币种列表
*
* @param currency 币种
* @return 币种
*/
@Override
public List<Currency> selectCurrencyList(Currency currency)
{
return currencyMapper.selectCurrencyList(currency);
}
/**
* 新增币种
*
* @param currency 币种
* @return 结果
*/
@Override
public int insertCurrency(Currency currency)
{
currency.setId(IdUtil.getSnowflakeNextId());
currency.setCreateTime(DateUtils.getNowDate());
return currencyMapper.insertCurrency(currency);
}
/**
* 修改币种
*
* @param currency 币种
* @return 结果
*/
@Override
public int updateCurrency(Currency currency)
{
currency.setUpdateTime(DateUtils.getNowDate());
return currencyMapper.updateCurrency(currency);
}
/**
* 批量删除币种
*
* @param ids 需要删除的币种主键
* @return 结果
*/
@Override
public int deleteCurrencyByIds(Long[] ids)
{
return currencyMapper.deleteCurrencyByIds(ids);
}
/**
* 删除币种信息
*
* @param id 币种主键
* @return 结果
*/
@Override
public int deleteCurrencyById(Long id)
{
return currencyMapper.deleteCurrencyById(id);
}
}

92
ff-bean/ff-domain/src/main/java/com/ff/common/service/impl/LangServiceImpl.java 100644
View File

@ -0,0 +1,92 @@
package com.ff.common.service.impl;
import cn.hutool.core.util.IdUtil;
import com.ff.common.domain.Lang;
import com.ff.common.mapper.LangMapper;
import com.ff.common.service.ILangService;
import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 系统语种管理 Service业务层处理
*
* @author shi
* @date 2025-02-10
*/
@Service
public class LangServiceImpl implements ILangService {
@Autowired
private LangMapper langMapper;
/**
* 查询系统语种管理
*
* @param id 系统语种管理 主键
* @return 系统语种管理
*/
@Override
public Lang selectLangById(Long id) {
return langMapper.selectLangById(id);
}
/**
* 查询系统语种管理 列表
*
* @param lang 系统语种管理
* @return 系统语种管理
*/
@Override
public List<Lang> selectLangList(Lang lang) {
return langMapper.selectLangList(lang);
}
/**
* 新增系统语种管理
*
* @param lang 系统语种管理
* @return 结果
*/
@Override
public int insertLang(Lang lang) {
lang.setId(IdUtil.getSnowflakeNextId());
lang.setCreateTime(DateUtils.getNowDate());
return langMapper.insertLang(lang);
}
/**
* 修改系统语种管理
*
* @param lang 系统语种管理
* @return 结果
*/
@Override
public int updateLang(Lang lang) {
lang.setUpdateTime(DateUtils.getNowDate());
return langMapper.updateLang(lang);
}
/**
* 批量删除系统语种管理
*
* @param ids 需要删除的系统语种管理 主键
* @return 结果
*/
@Override
public int deleteLangByIds(Long[] ids) {
return langMapper.deleteLangByIds(ids);
}
/**
* 删除系统语种管理 信息
*
* @param id 系统语种管理 主键
* @return 结果
*/
@Override
public int deleteLangById(Long id) {
return langMapper.deleteLangById(id);
}
}

0
ff-game/src/main/java/com/ff/game/domain/CurrencyInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/CurrencyInfo.java
View File

0
ff-game/src/main/java/com/ff/game/domain/ExtInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/ExtInfo.java
View File

9
ff-game/src/main/java/com/ff/game/domain/Game.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/Game.java
View File

@ -2,7 +2,6 @@ package com.ff.game.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -33,20 +32,17 @@ public class Game extends BaseEntity {
/** /**
* 排序 * 排序
*/ */
@Excel(name = "排序")
private Integer sortNo; private Integer sortNo;
/** /**
* 游戏平台id * 游戏平台id
*/ */
@Excel(name = "游戏平台id")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long platformId; private Long platformId;
/** /**
* 游戏第三方id * 游戏第三方id
*/ */
@Excel(name = "游戏第三方id")
private String gameCode; private String gameCode;
/** /**
@ -57,31 +53,26 @@ public class Game extends BaseEntity {
/** /**
* 第三方来源分类 * 第三方来源分类
*/ */
@Excel(name = "第三方来源分类")
private String gameSourceType; private String gameSourceType;
/** /**
* 游戏名称 * 游戏名称
*/ */
@Excel(name = "游戏名称")
private String gameName; private String gameName;
/** /**
* 是否支持免费游戏 1 支持 0 不支持 * 是否支持免费游戏 1 支持 0 不支持
*/ */
@Excel(name = "是否支持免费游戏 1 支持 0 不支持")
private Boolean freespin; private Boolean freespin;
/** /**
* 是否支持试玩 0关闭 1开启 * 是否支持试玩 0关闭 1开启
*/ */
@Excel(name = "是否支持试玩 0关闭 1开启")
private Boolean demoStatus; private Boolean demoStatus;
/** /**
* 维护开关 维护状态 * 维护开关 维护状态
*/ */
@Excel(name = "维护开关 ")
private Boolean stopStatus; private Boolean stopStatus;
/** /**

183
ff-bean/ff-domain/src/main/java/com/ff/game/domain/GameBettingDetails.java 100644
View File

@ -0,0 +1,183 @@
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;
}

79
ff-game/src/main/java/com/ff/game/domain/GameExchangeMoney.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/GameExchangeMoney.java
View File

@ -1,17 +1,15 @@
package com.ff.game.domain; package com.ff.game.domain;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/** /**
* 会员金额转移记录对象 ff_game_exchange_money * 会员金额转移记录对象 ff_game_exchange_money
* *
@ -22,24 +20,28 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class GameExchangeMoney extends BaseEntity public class GameExchangeMoney extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 租户key */ /**
@Excel(name = "租户key") * 租户key
*/
private String tenantKey; private String tenantKey;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 第三方交易id */ /**
@Excel(name = "第三方交易id") * 第三方交易id
*/
private String transactionId; private String transactionId;
/** /**
@ -47,47 +49,56 @@ public class GameExchangeMoney extends BaseEntity
*/ */
private String orderId; private String orderId;
/** 会员id */ /**
@Excel(name = "会员id") * 会员id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long memberId; private Long memberId;
/** 游戏平台 */ /**
@Excel(name = "游戏平台 ") * 游戏平台
*/
private String platformCode; private String platformCode;
/** 操作金额 */ /**
@Excel(name = "操作金额") * 操作金额
*/
private BigDecimal balance; private BigDecimal balance;
/** 租户操作额度 */ /**
@Excel(name = "租户操作额度") * 租户操作额度
*/
private BigDecimal quota; private BigDecimal quota;
/** 转账前金额(游戏币) */ /**
@Excel(name = " 转账前金额(游戏币)") * 转账前金额(游戏币)
*/
private BigDecimal coinBefore; private BigDecimal coinBefore;
/** 转账后金额(游戏币) */ /**
@Excel(name = "转账后金额(游戏币)") * 转账后金额(游戏币)
*/
private BigDecimal coinAfter; private BigDecimal coinAfter;
/** 转账前金额(指定货币) */ /**
@Excel(name = "转账前金额(指定货币)") * 转账前金额(指定货币)
*/
private BigDecimal currencyBefore; private BigDecimal currencyBefore;
/** 转账后金额(指定货币) */ /**
@Excel(name = "转账后金额(指定货币)") * 转账后金额(指定货币)
*/
private BigDecimal currencyAfter; private BigDecimal currencyAfter;
/**
/** 转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 3 游戏商转移额度到平台商 */ * 转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 3 游戏商转移额度到平台商
@Excel(name = "转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 3 游戏商转移额度到平台商") */
private Integer exchangeType; private Integer exchangeType;
/** 状态，0:进行中、1:成功、2:失败 */ /**
@Excel(name = "状态 1 成功 2失败") * 状态，0:进行中、1:成功、2:失败
*/
private Integer status; private Integer status;
/** /**

79
ff-game/src/main/java/com/ff/game/domain/GameFreeRecord.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/GameFreeRecord.java
View File

@ -2,10 +2,8 @@ package com.ff.game.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -20,73 +18,88 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor
public class GameFreeRecord extends BaseEntity public class GameFreeRecord extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;
/** 平台代码 */ /**
@Excel(name = "平台代码") * 平台代码
*/
private String platformCode; private String platformCode;
/** 免费局数序号（唯一标识符） */ /**
@Excel(name = "免费局数序号", readConverterExp = "唯=一标识符") * 免费局数序号（唯一标识符）
*/
private String referenceId; private String referenceId;
/** 会员id */ /**
@Excel(name = "会员id") * 会员id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long memberId; private Long memberId;
/** 用户账号 */ /**
@Excel(name = "用户账号") * 用户账号
*/
private String memberAccount; private String memberAccount;
/** 游戏id */ /**
@Excel(name = "游戏id ") * 游戏id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long gameId; private Long gameId;
/** 免费游戏局数可使用的开始时间 */ /**
@Excel(name = "免费游戏局数可使用的开始时间") * 免费游戏局数可使用的开始时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long sendTime; private Long sendTime;
/** 免费局数过期时间 */ /**
@Excel(name = "免费局数过期时间") * 免费局数过期时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long expiredTime; private Long expiredTime;
/** 免费局数记录更新时间 */ /**
@Excel(name = "免费局数记录更新时间") * 免费局数记录更新时间
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long freeUpdateTime; private Long freeUpdateTime;
/** 免费局数赠送的游戏名称 */ /**
@Excel(name = "免费局数赠送的游戏名称") * 免费局数赠送的游戏名称
*/
private String sendGame; private String sendGame;
/** 免费局数赠送的数量 */ /**
@Excel(name = "免费局数赠送的数量") * 免费局数赠送的数量
*/
private Integer sendAmount; private Integer sendAmount;
/** 已使用的免费局数数量 */ /**
@Excel(name = "已使用的免费局数数量") * 已使用的免费局数数量
*/
private Integer usedAmount; private Integer usedAmount;
/** 未使用的免费局数数量 */ /**
@Excel(name = "未使用的免费局数数量") * 未使用的免费局数数量
*/
private Integer unusedAmount; private Integer unusedAmount;
/** 免费状态 1正常 0 取消 */ /**
@Excel(name = "免费状态 1正常 0 取消 ") * 免费状态 1正常 0 取消
*/
private Integer freeStatus; private Integer freeStatus;

0
ff-game/src/main/java/com/ff/game/domain/KeyInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/KeyInfo.java
View File

0
ff-game/src/main/java/com/ff/game/domain/LangInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/LangInfo.java
View File

0
ff-game/src/main/java/com/ff/game/domain/NameInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/NameInfo.java
View File

0
ff-game/src/main/java/com/ff/game/domain/Platform.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/Platform.java
View File

0
ff-game/src/main/java/com/ff/game/domain/PlatformInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/PlatformInfo.java
View File

0
ff-game/src/main/java/com/ff/game/domain/UrlInfo.java → ff-bean/ff-domain/src/main/java/com/ff/game/domain/UrlInfo.java
View File

16
ff-game/src/main/java/com/ff/game/mapper/GameBettingDetailsMapper.java → ff-bean/ff-domain/src/main/java/com/ff/game/mapper/GameBettingDetailsMapper.java
View File

@ -1,10 +1,9 @@
package com.ff.game.mapper; package com.ff.game.mapper;
import java.util.List;
import com.ff.game.domain.GameBettingDetails; import com.ff.game.domain.GameBettingDetails;
import com.ff.game.dto.GameBettingDetailsDTO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
import java.util.List;
/** /**
* 会员投注细目Mapper接口 * 会员投注细目Mapper接口
@ -12,8 +11,7 @@ import org.springframework.security.core.parameters.P;
* @author shi * @author shi
* @date 2025-02-10 * @date 2025-02-10
*/ */
public interface GameBettingDetailsMapper public interface GameBettingDetailsMapper {
{
/** /**
* 查询会员投注细目 * 查询会员投注细目
* *
@ -33,14 +31,6 @@ public interface GameBettingDetailsMapper
List<String> selectGameBettingDetailsByWagersId(@Param("wagersIds") List<String> wagersIds, @Param("platformCode") String platformCode); List<String> selectGameBettingDetailsByWagersId(@Param("wagersIds") List<String> wagersIds, @Param("platformCode") String platformCode);
/**
* 查询会员投注细目列表
*
* @param gameBettingDetailsDTO 会员投注细目
* @return 会员投注细目集合
*/
List<GameBettingDetails> selectGameBettingDetailsList(GameBettingDetailsDTO gameBettingDetailsDTO);
/** /**
* 新增会员投注细目 * 新增会员投注细目
* *

14
ff-game/src/main/java/com/ff/game/mapper/GameExchangeMoneyMapper.java → ff-bean/ff-domain/src/main/java/com/ff/game/mapper/GameExchangeMoneyMapper.java
View File

@ -1,8 +1,8 @@
package com.ff.game.mapper; package com.ff.game.mapper;
import java.util.List;
import com.ff.game.domain.GameExchangeMoney; import com.ff.game.domain.GameExchangeMoney;
import com.ff.game.dto.GameExchangeMoneyDTO;
import java.util.List;
/** /**
* 会员金额转移记录Mapper接口 * 会员金额转移记录Mapper接口
@ -10,8 +10,7 @@ import com.ff.game.dto.GameExchangeMoneyDTO;
* @author shi * @author shi
* @date 2025-02-10 * @date 2025-02-10
*/ */
public interface GameExchangeMoneyMapper public interface GameExchangeMoneyMapper {
{
/** /**
* 查询会员金额转移记录 * 查询会员金额转移记录
* *
@ -28,13 +27,6 @@ public interface GameExchangeMoneyMapper
*/ */
List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney); List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney);
/**
* 选择游戏兑换货币列表
*
* @param gameExchangeMoneyDTO 游戏兑换货币dto
* @return {@link List }<{@link GameExchangeMoneyDTO }>
*/
List<GameExchangeMoneyDTO> selectGameExchangeMoneyDTOList(GameExchangeMoneyDTO gameExchangeMoneyDTO);
/** /**
* 新增会员金额转移记录 * 新增会员金额转移记录

3
ff-game/src/main/java/com/ff/game/mapper/GameFreeRecordMapper.java → ff-bean/ff-domain/src/main/java/com/ff/game/mapper/GameFreeRecordMapper.java
View File

@ -1,8 +1,9 @@
package com.ff.game.mapper; package com.ff.game.mapper;
import java.util.List;
import com.ff.game.domain.GameFreeRecord; import com.ff.game.domain.GameFreeRecord;
import java.util.List;
/** /**
* 免费赠送游戏记录Mapper接口 * 免费赠送游戏记录Mapper接口
* *

26
ff-game/src/main/java/com/ff/game/mapper/GameMapper.java → ff-bean/ff-domain/src/main/java/com/ff/game/mapper/GameMapper.java
View File

@ -1,9 +1,6 @@
package com.ff.game.mapper; package com.ff.game.mapper;
import com.ff.api.response.GameResponse;
import com.ff.game.api.request.GameUniqueDTO;
import com.ff.game.domain.Game; import com.ff.game.domain.Game;
import com.ff.game.dto.GameDTO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -82,28 +79,5 @@ public interface GameMapper {
*/ */
Integer selectMaxSortNoBy(@Param("platformType") Integer platformType, @Param("platformCode") String platformCode); Integer selectMaxSortNoBy(@Param("platformType") Integer platformType, @Param("platformCode") String platformCode);
/**
* 选择游戏唯一列表
*
* @param gameUniqueDTO 游戏独有dto
* @return {@link List }<{@link Game }>
*/
List<Game> selectGameUniqueList(GameUniqueDTO gameUniqueDTO);
/**
* 选择游戏响应列表
*
* @return {@link List }<{@link GameResponse }>
*/
List<GameResponse> selectGameResponseList();
/**
* 选择游戏数据列表
*
* @param gameDTO 游戏dto
* @return {@link List }<{@link Game }>
*/
List<Game> selectGameDTOList(GameDTO gameDTO);
} }

1
ff-game/src/main/java/com/ff/game/mapper/PlatformMapper.java → ff-bean/ff-domain/src/main/java/com/ff/game/mapper/PlatformMapper.java
View File

@ -9,7 +9,6 @@ import java.util.List;
*/ */
public interface PlatformMapper { public interface PlatformMapper {
List<Platform> selectList(Platform platform); List<Platform> selectList(Platform platform);
Platform selectByPlatformCode(String platformCode); Platform selectByPlatformCode(String platformCode);

79
ff-bean/ff-domain/src/main/java/com/ff/game/service/IGameBettingDetailsService.java 100644
View File

@ -0,0 +1,79 @@
package com.ff.game.service;
import com.ff.game.domain.GameBettingDetails;
import java.util.List;
/**
* 会员投注细目Service接口
*
* @author shi
* @date 2025-02-10
*/
public interface IGameBettingDetailsService {
/**
* 查询会员投注细目
*
* @param id 会员投注细目主键
* @return 会员投注细目
*/
GameBettingDetails selectGameBettingDetailsById(Long id);
/**
* 按投注id选择游戏投注详细信息
*
* @param wagersIds 投注ID
* @return {@link List }<{@link Long }>
*/
List<String> selectGameBettingDetailsByWagersId(List<String> wagersIds, String platformCode);
/**
* 新增会员投注细目
*
* @param gameBettingDetails 会员投注细目
* @return 结果
*/
int insertGameBettingDetails(GameBettingDetails gameBettingDetails);
/**
* 批量插入
*
* @param bettingDetails 投注详情
* @return int
*/
int batchInsert(List<GameBettingDetails> bettingDetails);
/**
* 修改会员投注细目
*
* @param gameBettingDetails 会员投注细目
* @return 结果
*/
int updateGameBettingDetails(GameBettingDetails gameBettingDetails);
/**
* 批量删除会员投注细目
*
* @param ids 需要删除的会员投注细目主键集合
* @return 结果
*/
int deleteGameBettingDetailsByIds(Long[] ids);
/**
* 删除会员投注细目信息
*
* @param id 会员投注细目主键
* @return 结果
*/
int deleteGameBettingDetailsById(Long id);
/**
* 按投注id删除游戏投注详细信息
*
* @param wagersId 投注id
* @return int
*/
int deleteGameBettingDetailsByWagersId(List<String> wagersId);
}

27
ff-game/src/main/java/com/ff/game/service/IGameExchangeMoneyService.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/IGameExchangeMoneyService.java
View File

@ -1,10 +1,8 @@
package com.ff.game.service; package com.ff.game.service;
import java.util.List;
import com.ff.game.domain.GameBettingDetails;
import com.ff.game.domain.GameExchangeMoney; import com.ff.game.domain.GameExchangeMoney;
import com.ff.game.dto.GameExchangeMoneyDTO;
import java.util.List;
/** /**
* 会员金额转移记录Service接口 * 会员金额转移记录Service接口
@ -12,8 +10,7 @@ import com.ff.game.dto.GameExchangeMoneyDTO;
* @author shi * @author shi
* @date 2025-02-10 * @date 2025-02-10
*/ */
public interface IGameExchangeMoneyService public interface IGameExchangeMoneyService {
{
/** /**
* 查询会员金额转移记录 * 查询会员金额转移记录
* *
@ -30,14 +27,6 @@ public interface IGameExchangeMoneyService
*/ */
List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney); List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney);
/**
* 选择游戏兑换货币列表
*
* @param gameExchangeMoneyDTO 游戏兑换货币dto
* @return {@link List }<{@link GameExchangeMoneyDTO }>
*/
List<GameExchangeMoneyDTO> selectGameExchangeMoneyDTOList(GameExchangeMoneyDTO gameExchangeMoneyDTO);
/** /**
* 新增会员金额转移记录 * 新增会员金额转移记录
* *
@ -46,16 +35,6 @@ public interface IGameExchangeMoneyService
*/ */
int insertGameExchangeMoney(GameExchangeMoney gameExchangeMoney); int insertGameExchangeMoney(GameExchangeMoney gameExchangeMoney);
/**
* 获取交易id
*
* @param prefix 前缀
* @param length 长
* @return {@link String }
*/
String getTransactionId(String prefix, int length );
/** /**
* 修改会员金额转移记录 * 修改会员金额转移记录
* *

62
ff-bean/ff-domain/src/main/java/com/ff/game/service/IGameFreeRecordService.java 100644
View File

@ -0,0 +1,62 @@
package com.ff.game.service;
import com.ff.game.domain.GameFreeRecord;
import java.util.List;
/**
* 免费赠送游戏记录Service接口
*
* @author shi
* @date 2025-02-10
*/
public interface IGameFreeRecordService
{
/**
* 查询免费赠送游戏记录
*
* @param id 免费赠送游戏记录主键
* @return 免费赠送游戏记录
*/
GameFreeRecord selectGameFreeRecordById(Long id);
/**
* 查询免费赠送游戏记录列表
*
* @param gameFreeRecord 免费赠送游戏记录
* @return 免费赠送游戏记录集合
*/
List<GameFreeRecord> selectGameFreeRecordList(GameFreeRecord gameFreeRecord);
/**
* 新增免费赠送游戏记录
*
* @param gameFreeRecord 免费赠送游戏记录
* @return 结果
*/
int insertGameFreeRecord(GameFreeRecord gameFreeRecord);
/**
* 修改免费赠送游戏记录
*
* @param gameFreeRecord 免费赠送游戏记录
* @return 结果
*/
int updateGameFreeRecord(GameFreeRecord gameFreeRecord);
/**
* 批量删除免费赠送游戏记录
*
* @param ids 需要删除的免费赠送游戏记录主键集合
* @return 结果
*/
int deleteGameFreeRecordByIds(Long[] ids);
/**
* 删除免费赠送游戏记录信息
*
* @param id 免费赠送游戏记录主键
* @return 结果
*/
int deleteGameFreeRecordById(Long id);
}

26
ff-game/src/main/java/com/ff/game/service/IGameService.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/IGameService.java
View File

@ -1,9 +1,6 @@
package com.ff.game.service; package com.ff.game.service;
import com.ff.api.response.GameResponse;
import com.ff.game.api.request.GameUniqueDTO;
import com.ff.game.domain.Game; import com.ff.game.domain.Game;
import com.ff.game.dto.GameDTO;
import java.util.List; import java.util.List;
@ -40,14 +37,6 @@ public interface IGameService {
List<Game> selectGameList(Game game); List<Game> selectGameList(Game game);
/**
* 选择游戏数据列表
*
* @param gameDTO 游戏dto
* @return {@link List }<{@link Game }>
*/
List<Game> selectGameDTOList(GameDTO gameDTO);
/** /**
* 新增平台子游戏管理 * 新增平台子游戏管理
* *
@ -87,20 +76,5 @@ public interface IGameService {
*/ */
Integer selectMaxSortNo(Integer platformType, String platformCode); Integer selectMaxSortNo(Integer platformType, String platformCode);
/**
* 选择游戏唯一列表
*
* @param gameUniqueDTO 游戏独有dto
* @return {@link List }<{@link Game }>
*/
List<Game> selectGameUniqueList(GameUniqueDTO gameUniqueDTO);
/**
* 选择游戏响应列表
*
* @return {@link List }<{@link GameResponse }>
*/
List<GameResponse> selectGameResponseList();
} }

3
ff-game/src/main/java/com/ff/game/service/IPlatformService.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/IPlatformService.java
View File

@ -21,7 +21,4 @@ public interface IPlatformService {
int deleteByIds(String ids); int deleteByIds(String ids);
void loadToCache();
Platform get(String platformCode);
} }

48
ff-game/src/main/java/com/ff/game/service/impl/GameBettingDetailsServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameBettingDetailsServiceImpl.java
View File

@ -1,16 +1,13 @@
package com.ff.game.service.impl; package com.ff.game.service.impl;
import java.util.Collections;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils; import com.ff.game.domain.GameBettingDetails;
import com.ff.game.dto.GameBettingDetailsDTO; import com.ff.game.mapper.GameBettingDetailsMapper;
import com.ff.game.service.IGameBettingDetailsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.game.mapper.GameBettingDetailsMapper;
import com.ff.game.domain.GameBettingDetails; import java.util.List;
import com.ff.game.service.IGameBettingDetailsService;
/** /**
* 会员投注细目Service业务层处理 * 会员投注细目Service业务层处理
@ -19,8 +16,7 @@ import com.ff.game.service.IGameBettingDetailsService;
* @date 2025-02-10 * @date 2025-02-10
*/ */
@Service @Service
public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService {
{
@Autowired @Autowired
private GameBettingDetailsMapper gameBettingDetailsMapper; private GameBettingDetailsMapper gameBettingDetailsMapper;
@ -31,8 +27,7 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
* @return 会员投注细目 * @return 会员投注细目
*/ */
@Override @Override
public GameBettingDetails selectGameBettingDetailsById(Long id) public GameBettingDetails selectGameBettingDetailsById(Long id) {
{
return gameBettingDetailsMapper.selectGameBettingDetailsById(id); return gameBettingDetailsMapper.selectGameBettingDetailsById(id);
} }
@ -44,20 +39,9 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
*/ */
@Override @Override
public List<String> selectGameBettingDetailsByWagersId(List<String> wagersIds, String platformCode) { public List<String> selectGameBettingDetailsByWagersId(List<String> wagersIds, String platformCode) {
return gameBettingDetailsMapper.selectGameBettingDetailsByWagersId(wagersIds,platformCode); return gameBettingDetailsMapper.selectGameBettingDetailsByWagersId(wagersIds, platformCode);
} }
/**
* 查询会员投注细目列表
*
* @param gameBettingDetailsDTO 会员投注细目
* @return 会员投注细目
*/
@Override
public List<GameBettingDetails> selectGameBettingDetailsList(GameBettingDetailsDTO gameBettingDetailsDTO)
{
return gameBettingDetailsMapper.selectGameBettingDetailsList(gameBettingDetailsDTO);
}
/** /**
* 新增会员投注细目 * 新增会员投注细目
@ -66,10 +50,9 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertGameBettingDetails(GameBettingDetails gameBettingDetails) public int insertGameBettingDetails(GameBettingDetails gameBettingDetails) {
{
gameBettingDetails.setId(IdUtil.getSnowflakeNextId()); gameBettingDetails.setId(IdUtil.getSnowflakeNextId());
gameBettingDetails.setCreateTime(DateUtils.getNowDate()); gameBettingDetails.setCreateTime(System.currentTimeMillis());
return gameBettingDetailsMapper.insertGameBettingDetails(gameBettingDetails); return gameBettingDetailsMapper.insertGameBettingDetails(gameBettingDetails);
} }
@ -91,9 +74,8 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateGameBettingDetails(GameBettingDetails gameBettingDetails) public int updateGameBettingDetails(GameBettingDetails gameBettingDetails) {
{ gameBettingDetails.setUpdateTime(System.currentTimeMillis());
gameBettingDetails.setUpdateTime(DateUtils.getNowDate());
return gameBettingDetailsMapper.updateGameBettingDetails(gameBettingDetails); return gameBettingDetailsMapper.updateGameBettingDetails(gameBettingDetails);
} }
@ -104,8 +86,7 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameBettingDetailsByIds(Long[] ids) public int deleteGameBettingDetailsByIds(Long[] ids) {
{
return gameBettingDetailsMapper.deleteGameBettingDetailsByIds(ids); return gameBettingDetailsMapper.deleteGameBettingDetailsByIds(ids);
} }
@ -116,8 +97,7 @@ public class GameBettingDetailsServiceImpl implements IGameBettingDetailsService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameBettingDetailsById(Long id) public int deleteGameBettingDetailsById(Long id) {
{
return gameBettingDetailsMapper.deleteGameBettingDetailsById(id); return gameBettingDetailsMapper.deleteGameBettingDetailsById(id);
} }

66
ff-game/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java
View File

@ -1,20 +1,15 @@
package com.ff.game.service.impl; package com.ff.game.service.impl;
import java.util.Collections;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.base.enums.GamePlatforms;
import com.ff.base.utils.DateUtils;
import com.ff.base.utils.StringUtils;
import com.ff.game.dto.GameExchangeMoneyDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ff.game.mapper.GameExchangeMoneyMapper;
import com.ff.game.domain.GameExchangeMoney; import com.ff.game.domain.GameExchangeMoney;
import com.ff.game.mapper.GameExchangeMoneyMapper;
import com.ff.game.service.IGameExchangeMoneyService; import com.ff.game.service.IGameExchangeMoneyService;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 会员金额转移记录Service业务层处理 * 会员金额转移记录Service业务层处理
@ -23,8 +18,7 @@ import org.springframework.util.ObjectUtils;
* @date 2025-02-10 * @date 2025-02-10
*/ */
@Service @Service
public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService {
{
@Autowired @Autowired
private GameExchangeMoneyMapper gameExchangeMoneyMapper; private GameExchangeMoneyMapper gameExchangeMoneyMapper;
@ -35,8 +29,7 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
* @return 会员金额转移记录 * @return 会员金额转移记录
*/ */
@Override @Override
public GameExchangeMoney selectGameExchangeMoneyById(Long id) public GameExchangeMoney selectGameExchangeMoneyById(Long id) {
{
return gameExchangeMoneyMapper.selectGameExchangeMoneyById(id); return gameExchangeMoneyMapper.selectGameExchangeMoneyById(id);
} }
@ -47,16 +40,10 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
* @return 会员金额转移记录 * @return 会员金额转移记录
*/ */
@Override @Override
public List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney) public List<GameExchangeMoney> selectGameExchangeMoneyList(GameExchangeMoney gameExchangeMoney) {
{
return gameExchangeMoneyMapper.selectGameExchangeMoneyList(gameExchangeMoney); return gameExchangeMoneyMapper.selectGameExchangeMoneyList(gameExchangeMoney);
} }
@Override
public List<GameExchangeMoneyDTO> selectGameExchangeMoneyDTOList(GameExchangeMoneyDTO gameExchangeMoneyDTO) {
return gameExchangeMoneyMapper.selectGameExchangeMoneyDTOList(gameExchangeMoneyDTO);
}
/** /**
* 新增会员金额转移记录 * 新增会员金额转移记录
* *
@ -73,32 +60,6 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
return gameExchangeMoneyMapper.insertGameExchangeMoney(gameExchangeMoney); return gameExchangeMoneyMapper.insertGameExchangeMoney(gameExchangeMoney);
} }
/**
* 获取交易id
*
* @param prefix 前缀
* @param length 长
* @return {@link String }
*/
@Override
public synchronized String getTransactionId(String prefix, int length) {
String transactionId = StringUtils.generateOrderId(prefix,length);
List<GameExchangeMoney> gameExchangeMonies = this.selectGameExchangeMoneyList(
GameExchangeMoney.builder()
.transactionId(transactionId)
.build()
);
while (!CollectionUtils.isEmpty(gameExchangeMonies)){
transactionId = StringUtils.generateOrderId(prefix,length);
gameExchangeMonies = this.selectGameExchangeMoneyList(
GameExchangeMoney.builder()
.transactionId(transactionId)
.build()
);
}
return transactionId;
}
/** /**
* 修改会员金额转移记录 * 修改会员金额转移记录
@ -107,9 +68,8 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateGameExchangeMoney(GameExchangeMoney gameExchangeMoney) public int updateGameExchangeMoney(GameExchangeMoney gameExchangeMoney) {
{ gameExchangeMoney.setUpdateTime(System.currentTimeMillis());
gameExchangeMoney.setUpdateTime(DateUtils.getNowDate());
return gameExchangeMoneyMapper.updateGameExchangeMoney(gameExchangeMoney); return gameExchangeMoneyMapper.updateGameExchangeMoney(gameExchangeMoney);
} }
@ -120,8 +80,7 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameExchangeMoneyByIds(Long[] ids) public int deleteGameExchangeMoneyByIds(Long[] ids) {
{
return gameExchangeMoneyMapper.deleteGameExchangeMoneyByIds(ids); return gameExchangeMoneyMapper.deleteGameExchangeMoneyByIds(ids);
} }
@ -132,8 +91,7 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameExchangeMoneyById(Long id) public int deleteGameExchangeMoneyById(Long id) {
{
return gameExchangeMoneyMapper.deleteGameExchangeMoneyById(id); return gameExchangeMoneyMapper.deleteGameExchangeMoneyById(id);
} }
} }

36
ff-game/src/main/java/com/ff/game/service/impl/GameFreeRecordServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameFreeRecordServiceImpl.java
View File

@ -1,14 +1,13 @@
package com.ff.game.service.impl; package com.ff.game.service.impl;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.base.utils.DateUtils; import com.ff.game.domain.GameFreeRecord;
import com.ff.game.mapper.GameFreeRecordMapper;
import com.ff.game.service.IGameFreeRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.game.mapper.GameFreeRecordMapper;
import com.ff.game.domain.GameFreeRecord; import java.util.List;
import com.ff.game.service.IGameFreeRecordService;
/** /**
* 免费赠送游戏记录Service业务层处理 * 免费赠送游戏记录Service业务层处理
@ -17,8 +16,7 @@ import com.ff.game.service.IGameFreeRecordService;
* @date 2025-02-10 * @date 2025-02-10
*/ */
@Service @Service
public class GameFreeRecordServiceImpl implements IGameFreeRecordService public class GameFreeRecordServiceImpl implements IGameFreeRecordService {
{
@Autowired @Autowired
private GameFreeRecordMapper gameFreeRecordMapper; private GameFreeRecordMapper gameFreeRecordMapper;
@ -29,8 +27,7 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 免费赠送游戏记录 * @return 免费赠送游戏记录
*/ */
@Override @Override
public GameFreeRecord selectGameFreeRecordById(Long id) public GameFreeRecord selectGameFreeRecordById(Long id) {
{
return gameFreeRecordMapper.selectGameFreeRecordById(id); return gameFreeRecordMapper.selectGameFreeRecordById(id);
} }
@ -41,8 +38,7 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 免费赠送游戏记录 * @return 免费赠送游戏记录
*/ */
@Override @Override
public List<GameFreeRecord> selectGameFreeRecordList(GameFreeRecord gameFreeRecord) public List<GameFreeRecord> selectGameFreeRecordList(GameFreeRecord gameFreeRecord) {
{
return gameFreeRecordMapper.selectGameFreeRecordList(gameFreeRecord); return gameFreeRecordMapper.selectGameFreeRecordList(gameFreeRecord);
} }
@ -53,10 +49,9 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertGameFreeRecord(GameFreeRecord gameFreeRecord) public int insertGameFreeRecord(GameFreeRecord gameFreeRecord) {
{
gameFreeRecord.setId(IdUtil.getSnowflakeNextId()); gameFreeRecord.setId(IdUtil.getSnowflakeNextId());
gameFreeRecord.setCreateTime(DateUtils.getNowDate()); gameFreeRecord.setCreateTime(System.currentTimeMillis());
return gameFreeRecordMapper.insertGameFreeRecord(gameFreeRecord); return gameFreeRecordMapper.insertGameFreeRecord(gameFreeRecord);
} }
@ -67,9 +62,8 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateGameFreeRecord(GameFreeRecord gameFreeRecord) public int updateGameFreeRecord(GameFreeRecord gameFreeRecord) {
{ gameFreeRecord.setUpdateTime(System.currentTimeMillis());
gameFreeRecord.setUpdateTime(DateUtils.getNowDate());
return gameFreeRecordMapper.updateGameFreeRecord(gameFreeRecord); return gameFreeRecordMapper.updateGameFreeRecord(gameFreeRecord);
} }
@ -80,8 +74,7 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameFreeRecordByIds(Long[] ids) public int deleteGameFreeRecordByIds(Long[] ids) {
{
return gameFreeRecordMapper.deleteGameFreeRecordByIds(ids); return gameFreeRecordMapper.deleteGameFreeRecordByIds(ids);
} }
@ -92,8 +85,7 @@ public class GameFreeRecordServiceImpl implements IGameFreeRecordService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteGameFreeRecordById(Long id) public int deleteGameFreeRecordById(Long id) {
{
return gameFreeRecordMapper.deleteGameFreeRecordById(id); return gameFreeRecordMapper.deleteGameFreeRecordById(id);
} }
} }

50
ff-game/src/main/java/com/ff/game/service/impl/GameServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameServiceImpl.java
View File

@ -1,22 +1,14 @@
package com.ff.game.service.impl; package com.ff.game.service.impl;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.api.response.GameResponse;
import com.ff.base.utils.DateUtils;
import com.ff.game.api.IGamesService;
import com.ff.game.api.request.GameUniqueDTO;
import com.ff.game.domain.Game; import com.ff.game.domain.Game;
import com.ff.game.dto.GameDTO;
import com.ff.game.mapper.GameMapper; import com.ff.game.mapper.GameMapper;
import com.ff.game.service.IGameService; import com.ff.game.service.IGameService;
import com.ff.member.service.IMemberService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 平台子游戏管理Service业务层处理 * 平台子游戏管理Service业务层处理
@ -31,12 +23,6 @@ public class GameServiceImpl implements IGameService {
@Autowired @Autowired
private GameMapper gameMapper; private GameMapper gameMapper;
@Resource
private IMemberService memberService;
@Autowired
private Map<String, IGamesService> gamesService;
/** /**
* 查询平台子游戏管理 * 查询平台子游戏管理
* *
@ -70,16 +56,6 @@ public class GameServiceImpl implements IGameService {
return gameMapper.selectGameList(game); return gameMapper.selectGameList(game);
} }
/**
* 选择游戏数据列表
*
* @param gameDTO 游戏dto
* @return {@link List }<{@link Game }>
*/
@Override
public List<Game> selectGameDTOList(GameDTO gameDTO) {
return gameMapper.selectGameDTOList(gameDTO);
}
/** /**
* 新增平台子游戏管理 * 新增平台子游戏管理
@ -92,7 +68,7 @@ public class GameServiceImpl implements IGameService {
if (game.getId() == null) { if (game.getId() == null) {
game.setId(IdUtil.getSnowflakeNextId()); game.setId(IdUtil.getSnowflakeNextId());
} }
game.setCreateTime(DateUtils.getNowDate()); game.setCreateTime(System.currentTimeMillis());
return gameMapper.insertGame(game); return gameMapper.insertGame(game);
} }
@ -104,7 +80,7 @@ public class GameServiceImpl implements IGameService {
*/ */
@Override @Override
public int updateGame(Game game) { public int updateGame(Game game) {
game.setUpdateTime(DateUtils.getNowDate()); game.setUpdateTime(System.currentTimeMillis());
return gameMapper.updateGame(game); return gameMapper.updateGame(game);
} }
@ -130,31 +106,9 @@ public class GameServiceImpl implements IGameService {
return gameMapper.deleteGameById(id); return gameMapper.deleteGameById(id);
} }
/**
* 选择游戏唯一列表
*
* @param gameUniqueDTO 游戏独有dto
* @return {@link List }<{@link Game }>
*/
@Override
public List<Game> selectGameUniqueList(GameUniqueDTO gameUniqueDTO) {
return gameMapper.selectGameUniqueList(gameUniqueDTO);
}
/**
* 选择游戏响应列表
*
* @return {@link List }<{@link GameResponse }>
*/
@Override
public List<GameResponse> selectGameResponseList() {
return gameMapper.selectGameResponseList();
}
@Override @Override
public Integer selectMaxSortNo(Integer platformType, String platformCode) { public Integer selectMaxSortNo(Integer platformType, String platformCode) {
return gameMapper.selectMaxSortNoBy(platformType, platformCode); return gameMapper.selectMaxSortNoBy(platformType, platformCode);
} }
} }

50
ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/PlatformServiceImpl.java 100644
View File

@ -0,0 +1,50 @@
package com.ff.game.service.impl;
import com.ff.game.domain.Platform;
import com.ff.game.mapper.PlatformMapper;
import com.ff.game.service.IPlatformService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author cengy
*/
@Service
public class PlatformServiceImpl implements IPlatformService {
@Autowired
PlatformMapper platformMapper;
@Override
public List<Platform> selectList(Platform platform) {
return platformMapper.selectList(platform);
}
@Override
public Platform selectByPlatformCode(String platformCode) {
return platformMapper.selectByPlatformCode(platformCode);
}
@Override
public int updatePlatform(Platform platform) {
return platformMapper.updatePlatform(platform);
}
@Override
public int insertPlatform(Platform platform) {
return platformMapper.insertPlatform(platform);
}
@Override
public int deleteById(Long id) {
return platformMapper.deleteById(id);
}
@Override
public int deleteByIds(String ids) {
return platformMapper.deleteByIds(ids);
}
}

34
ff-game/src/main/java/com/ff/member/domain/Member.java → ff-bean/ff-domain/src/main/java/com/ff/member/domain/Member.java
View File

@ -2,10 +2,8 @@ package com.ff.member.domain;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -20,32 +18,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class Member extends BaseEntity public class Member extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* 主键id
*/
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 租户key */ /**
@Excel(name = "租户key") * 租户key
*/
private String tenantKey; private String tenantKey;
/** 会员账号 */ /**
@Excel(name = "会员账号") * 会员账号
*/
private String memberAccount; private String memberAccount;
/** 游戏账号 */ /**
@Excel(name = "游戏账号") * 游戏账号
*/
private String gameAccount; private String gameAccount;
/** 平台编码 */ /**
@Excel(name = "平台编码") * 平台编码
*/
private String platformCode; private String platformCode;
/** 币种编码 */ /**
@Excel(name = "币种编码") * 币种编码
*/
private String currencyCode; private String currencyCode;

3
ff-game/src/main/java/com/ff/member/mapper/MemberMapper.java → ff-bean/ff-domain/src/main/java/com/ff/member/mapper/MemberMapper.java
View File

@ -1,9 +1,10 @@
package com.ff.member.mapper; package com.ff.member.mapper;
import java.util.List;
import com.ff.member.domain.Member; import com.ff.member.domain.Member;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 会员Mapper接口 * 会员Mapper接口
* *

17
ff-game/src/main/java/com/ff/member/service/IMemberService.java → ff-bean/ff-domain/src/main/java/com/ff/member/service/IMemberService.java
View File

@ -1,16 +1,16 @@
package com.ff.member.service; package com.ff.member.service;
import java.util.List;
import com.ff.member.domain.Member; import com.ff.member.domain.Member;
import java.util.List;
/** /**
* 会员Service接口 * 会员Service接口
* *
* @author shi * @author shi
* @date 2025-02-10 * @date 2025-02-10
*/ */
public interface IMemberService public interface IMemberService {
{
/** /**
* 查询会员 * 查询会员
* *
@ -27,15 +27,6 @@ public interface IMemberService
*/ */
List<Member> selectMemberList(Member member); List<Member> selectMemberList(Member member);
/**
* 生成会员游戏账号
*
* @param platformCode 平台代码
* @param tenantSn 租户sn
* @return {@link String }
*/
String getMemberGameAccount(String platformCode,String tenantSn);
/** /**
* 新增会员 * 新增会员
* *
@ -85,5 +76,5 @@ public interface IMemberService
* @param platformCode 平台代码 * @param platformCode 平台代码
* @return {@link Member } * @return {@link Member }
*/ */
Member selectMemberByAccount(String account,String currencyCode,String platformCode); Member selectMemberByAccount(String account, String currencyCode, String platformCode);
} }

43
ff-game/src/main/java/com/ff/member/service/impl/MemberServiceImpl.java → ff-bean/ff-domain/src/main/java/com/ff/member/service/impl/MemberServiceImpl.java
View File

@ -1,18 +1,14 @@
package com.ff.member.service.impl; package com.ff.member.service.impl;
import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ff.base.enums.GamePlatforms; import com.ff.member.domain.Member;
import com.ff.base.enums.PlatformType; import com.ff.member.mapper.MemberMapper;
import com.ff.base.utils.DateUtils; import com.ff.member.service.IMemberService;
import com.ff.base.utils.RandomGeneratorUtils; import com.ff.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ff.member.mapper.MemberMapper;
import com.ff.member.domain.Member; import java.util.List;
import com.ff.member.service.IMemberService;
import org.springframework.util.ObjectUtils;
/** /**
* 会员Service业务层处理 * 会员Service业务层处理
@ -47,33 +43,6 @@ public class MemberServiceImpl implements IMemberService {
return memberMapper.selectMemberList(member); return memberMapper.selectMemberList(member);
} }
/**
* 获取会员游戏账号
*
* @return {@link String }
*/
@Override
public synchronized String getMemberGameAccount(String platformCode,String tenantSn) {
String gameAccount = null;
if (GamePlatforms.DG.getInfo().equals(platformCode) || GamePlatforms.KM.getInfo().equals(platformCode)) {
tenantSn=tenantSn.toUpperCase();
do {
gameAccount = RandomGeneratorUtils.generateRandomAccountUpper()+tenantSn;
} while (!ObjectUtils.isEmpty(memberMapper.selectMemberByGameAccount(gameAccount)));
} else if (GamePlatforms.PG.getInfo().equals(platformCode) || GamePlatforms.PGX.getInfo().equals(platformCode) || GamePlatforms.PGT.getInfo().equals(platformCode)) {
tenantSn=tenantSn.toLowerCase();
do {
gameAccount = RandomGeneratorUtils.generateRandomAccountLower()+tenantSn;
} while (!ObjectUtils.isEmpty(memberMapper.selectMemberByGameAccount(gameAccount)));
} else {
do {
gameAccount = RandomGeneratorUtils.generateRandomAccount()+tenantSn;
} while (!ObjectUtils.isEmpty(memberMapper.selectMemberByGameAccount(gameAccount)));
}
return gameAccount;
}
/** /**
* 新增会员 * 新增会员

60
ff-bean/ff-domain/src/main/java/com/ff/sys/domain/SysFeedback.java 100644
View File

@ -0,0 +1,60 @@
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;
}

19
ff-game/src/main/java/com/ff/sys/domain/SysNotice.java → ff-bean/ff-domain/src/main/java/com/ff/sys/domain/SysNotice.java
View File

@ -1,8 +1,8 @@
package com.ff.sys.domain; package com.ff.sys.domain;
import com.ff.base.annotation.Excel;
import com.ff.base.core.domain.BaseEntity; import com.ff.base.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
/** /**
* 系统公告对象 ff_sys_notice * 系统公告对象 ff_sys_notice
* *
@ -10,19 +10,22 @@ import lombok.Data;
* @date 2025-02-28 * @date 2025-02-28
*/ */
@Data @Data
public class SysNotice extends BaseEntity public class SysNotice extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** $column.columnComment */ /**
* $column.columnComment
*/
private Long id; private Long id;
/** 标题 */ /**
@Excel(name = "标题") * 标题
*/
private String title; private String title;
/** 内容 */ /**
@Excel(name = "内容") * 内容
*/
private String content; private String content;

3
ff-game/src/main/java/com/ff/sys/mapper/SysFeedbackMapper.java → ff-bean/ff-domain/src/main/java/com/ff/sys/mapper/SysFeedbackMapper.java
View File

@ -1,8 +1,9 @@
package com.ff.sys.mapper; package com.ff.sys.mapper;
import java.util.List;
import com.ff.sys.domain.SysFeedback; import com.ff.sys.domain.SysFeedback;
import java.util.List;
/** /**
* 系统反馈Mapper接口 * 系统反馈Mapper接口
* *

3
ff-game/src/main/java/com/ff/sys/mapper/SysNoticeMapper.java → ff-bean/ff-domain/src/main/java/com/ff/sys/mapper/SysNoticeMapper.java
View File

@ -1,8 +1,9 @@
package com.ff.sys.mapper; package com.ff.sys.mapper;
import java.util.List;
import com.ff.sys.domain.SysNotice; import com.ff.sys.domain.SysNotice;
import java.util.List;
/** /**
* 系统公告Mapper接口 * 系统公告Mapper接口
* *

6
ff-game/src/main/java/com/ff/sys/service/ISysFeedbackService.java → ff-bean/ff-domain/src/main/java/com/ff/sys/service/ISysFeedbackService.java
View File

@ -1,16 +1,16 @@
package com.ff.sys.service; package com.ff.sys.service;
import java.util.List;
import com.ff.sys.domain.SysFeedback; import com.ff.sys.domain.SysFeedback;
import java.util.List;
/** /**
* 系统反馈Service接口 * 系统反馈Service接口
* *
* @author shi * @author shi
* @date 2025-02-27 * @date 2025-02-27
*/ */
public interface ISysFeedbackService public interface ISysFeedbackService {
{
/** /**
* 查询系统反馈 * 查询系统反馈
* *

Some files were not shown because too many files have changed in this diff Show More