From 0df6716cc346b70f3f69d01f604165c3c04ede88 Mon Sep 17 00:00:00 2001
From: luqingjie <544309509@qq.com>
Date: Sat, 26 Sep 2026 21:40:53 -0400
Subject: [PATCH] 234
---
.../src/main/resources/application.yml | 2 +-
.../domain/UsdtAggregationTaskItem.java | 80 ++++++++-
.../domain/UsdtAggregationTaskItemPlus.java | 79 ++++++++-
.../ruoyi/system/domain/WalletAddress.java | 148 ++++++++---------
.../system/domain/WalletAddressPlus.java | 152 +++++++++---------
.../mapper/system/WalletAddressMapper.xml | 7 +-
6 files changed, 305 insertions(+), 163 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7678f64..2e61411 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -35,7 +35,7 @@ plugin:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 2020
+ port: 8080
servlet:
# 应用的访问路径
context-path: /
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java
index 4db138d..237017e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
* 归集任务明细对象 usdt_aggregation_task_item
*
* @author luqj
- * @date 2026-01-01
+ * @date 2026-09-26
*/
public class UsdtAggregationTaskItem extends BaseEntity
{
@@ -27,7 +27,7 @@ public class UsdtAggregationTaskItem extends BaseEntity
/** 状态0 待执行 1 执行 2 执行失败 */
@Excel(name = "状态0 待执行 1 执行 2 执行失败")
- private Integer status;
+ private Long status;
/** 金额 */
@Excel(name = "金额")
@@ -44,8 +44,30 @@ public class UsdtAggregationTaskItem extends BaseEntity
private Date updatedAt;
/** 删除时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
+ /** 需要的能量 */
+ @Excel(name = "需要的能量")
+ private Long needEnergyNum;
+
+ /** 需要的带宽 */
+ @Excel(name = "需要的带宽")
+ private Long needBandwidthNum;
+
+ /** 需要的带宽缺口 */
+ @Excel(name = "需要的带宽缺口")
+ private Long gapBandwidthNum;
+
+ /** 需要的能量缺口 */
+ @Excel(name = "需要的能量缺口")
+ private Long gapEnergyNum;
+
+ /** 预计消耗的trx */
+ @Excel(name = "预计消耗的trx")
+ private Long willUseTrxNum;
+
/** 用户 */
@Excel(name = "用户")
private Long userId;
@@ -80,12 +102,12 @@ public class UsdtAggregationTaskItem extends BaseEntity
{
return tokenAddress;
}
- public void setStatus(Integer status)
+ public void setStatus(Long status)
{
this.status = status;
}
- public Integer getStatus()
+ public Long getStatus()
{
return status;
}
@@ -125,6 +147,51 @@ public class UsdtAggregationTaskItem extends BaseEntity
{
return deletedAt;
}
+ public void setNeedEnergyNum(Long needEnergyNum)
+ {
+ this.needEnergyNum = needEnergyNum;
+ }
+
+ public Long getNeedEnergyNum()
+ {
+ return needEnergyNum;
+ }
+ public void setNeedBandwidthNum(Long needBandwidthNum)
+ {
+ this.needBandwidthNum = needBandwidthNum;
+ }
+
+ public Long getNeedBandwidthNum()
+ {
+ return needBandwidthNum;
+ }
+ public void setGapBandwidthNum(Long gapBandwidthNum)
+ {
+ this.gapBandwidthNum = gapBandwidthNum;
+ }
+
+ public Long getGapBandwidthNum()
+ {
+ return gapBandwidthNum;
+ }
+ public void setGapEnergyNum(Long gapEnergyNum)
+ {
+ this.gapEnergyNum = gapEnergyNum;
+ }
+
+ public Long getGapEnergyNum()
+ {
+ return gapEnergyNum;
+ }
+ public void setWillUseTrxNum(Long willUseTrxNum)
+ {
+ this.willUseTrxNum = willUseTrxNum;
+ }
+
+ public Long getWillUseTrxNum()
+ {
+ return willUseTrxNum;
+ }
public void setUserId(Long userId)
{
this.userId = userId;
@@ -173,6 +240,11 @@ public class UsdtAggregationTaskItem extends BaseEntity
.append("createdAt", getCreatedAt())
.append("updatedAt", getUpdatedAt())
.append("deletedAt", getDeletedAt())
+ .append("needEnergyNum", getNeedEnergyNum())
+ .append("needBandwidthNum", getNeedBandwidthNum())
+ .append("gapBandwidthNum", getGapBandwidthNum())
+ .append("gapEnergyNum", getGapEnergyNum())
+ .append("willUseTrxNum", getWillUseTrxNum())
.append("userId", getUserId())
.append("appId", getAppId())
.append("parentId", getParentId())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java
index de7486b..c6be51f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java
@@ -2,9 +2,6 @@ package com.ruoyi.system.domain;
import java.math.BigDecimal;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
* 归集任务明细对象 usdt_aggregation_task_item
*
* @author luqj
- * @date 2026-01-01
+ * @date 2026-09-26
*/
@TableName(value = "usdt_aggregation_task_item")
public class UsdtAggregationTaskItemPlus implements Serializable
@@ -25,14 +22,13 @@ public class UsdtAggregationTaskItemPlus implements Serializable
private static final long serialVersionUID = 1L;
/** 主键 */
- @TableId(type = IdType.INPUT)
private Long id;
/** 钱包地址 */
@Excel(name = "钱包地址")
private String tokenAddress;
/** 状态0 待执行 1 执行 2 执行失败 */
@Excel(name = "状态0 待执行 1 执行 2 执行失败")
- private Integer status;
+ private Long status;
/** 备注 */
@Excel(name = "备注")
private String remark;
@@ -48,7 +44,24 @@ public class UsdtAggregationTaskItemPlus implements Serializable
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedAt;
/** 删除时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
+ /** 需要的能量 */
+ @Excel(name = "需要的能量")
+ private Long needEnergyNum;
+ /** 需要的带宽 */
+ @Excel(name = "需要的带宽")
+ private Long needBandwidthNum;
+ /** 需要的带宽缺口 */
+ @Excel(name = "需要的带宽缺口")
+ private Long gapBandwidthNum;
+ /** 需要的能量缺口 */
+ @Excel(name = "需要的能量缺口")
+ private Long gapEnergyNum;
+ /** 预计消耗的trx */
+ @Excel(name = "预计消耗的trx")
+ private Long willUseTrxNum;
/** 用户 */
@Excel(name = "用户")
private Long userId;
@@ -79,12 +92,12 @@ public class UsdtAggregationTaskItemPlus implements Serializable
{
return tokenAddress;
}
- public void setStatus(Integer status)
+ public void setStatus(Long status)
{
this.status = status;
}
- public Integer getStatus()
+ public Long getStatus()
{
return status;
}
@@ -133,6 +146,51 @@ public class UsdtAggregationTaskItemPlus implements Serializable
{
return deletedAt;
}
+ public void setNeedEnergyNum(Long needEnergyNum)
+ {
+ this.needEnergyNum = needEnergyNum;
+ }
+
+ public Long getNeedEnergyNum()
+ {
+ return needEnergyNum;
+ }
+ public void setNeedBandwidthNum(Long needBandwidthNum)
+ {
+ this.needBandwidthNum = needBandwidthNum;
+ }
+
+ public Long getNeedBandwidthNum()
+ {
+ return needBandwidthNum;
+ }
+ public void setGapBandwidthNum(Long gapBandwidthNum)
+ {
+ this.gapBandwidthNum = gapBandwidthNum;
+ }
+
+ public Long getGapBandwidthNum()
+ {
+ return gapBandwidthNum;
+ }
+ public void setGapEnergyNum(Long gapEnergyNum)
+ {
+ this.gapEnergyNum = gapEnergyNum;
+ }
+
+ public Long getGapEnergyNum()
+ {
+ return gapEnergyNum;
+ }
+ public void setWillUseTrxNum(Long willUseTrxNum)
+ {
+ this.willUseTrxNum = willUseTrxNum;
+ }
+
+ public Long getWillUseTrxNum()
+ {
+ return willUseTrxNum;
+ }
public void setUserId(Long userId)
{
this.userId = userId;
@@ -181,6 +239,11 @@ public class UsdtAggregationTaskItemPlus implements Serializable
.append("createdAt", getCreatedAt())
.append("updatedAt", getUpdatedAt())
.append("deletedAt", getDeletedAt())
+ .append("needEnergyNum", getNeedEnergyNum())
+ .append("needBandwidthNum", getNeedBandwidthNum())
+ .append("gapBandwidthNum", getGapBandwidthNum())
+ .append("gapEnergyNum", getGapEnergyNum())
+ .append("willUseTrxNum", getWillUseTrxNum())
.append("userId", getUserId())
.append("appId", getAppId())
.append("parentId", getParentId())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java
index 97c1efd..b9dc8f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddress.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.io.Serializable;
/**
- * 【请填写功能名称】对象 wallet_address
+ * 钱包对象 wallet_address
*
* @author luqj
* @date 2026-09-26
@@ -21,139 +21,149 @@ public class WalletAddress extends BaseEntity
/** $column.columnComment */
private Long id;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 钱包token */
+ @Excel(name = "钱包token")
private String token;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 1:启用 2:禁用 */
+ @Excel(name = "1:启用 2:禁用")
private Long status;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdAt;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedAt;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** appId */
+ @Excel(name = "appId")
private Long appId;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** userId */
+ @Excel(name = "userId")
private Long userId;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 钱包所属用户,通过接口传入 */
+ @Excel(name = "钱包所属用户,通过接口传入")
private String walletUserName;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 子账号对应的索引位置 */
+ @Excel(name = "子账号对应的索引位置")
private String tokenIndex;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "token key")
private String tokenKey;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** usdt余额 */
+ @Excel(name = "usdt余额")
private BigDecimal usdtBalance;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "usdt余额")
private BigDecimal trxBalance;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量-可用 */
+ @Excel(name = "能量-可用")
private Long energyNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量总额 */
+ @Excel(name = "能量总额")
private Long energyAllNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量-已用 */
+ @Excel(name = "能量-已用")
private Long energyUsedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 带宽-可用 */
+ @Excel(name = "带宽-可用")
private Long bandwidthNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人能量的trx数量 */
+ @Excel(name = "代理给别人能量的trx数量")
private Long delegatedEnergyTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的能量 */
+ @Excel(name = "代理给别人的能量")
private BigDecimal delegatedEnergyValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我能量的trx数量 */
+ @Excel(name = "别人代理给我能量的trx数量")
private Long acquiredDelegatedEnergyTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我的能量 */
+ @Excel(name = "别人代理给我的能量")
private BigDecimal acquiredDelegatedEnergyValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的带宽trx数量 */
+ @Excel(name = "代理给别人的带宽trx数量")
private Long delegatedBandwidthTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的带宽 */
+ @Excel(name = "代理给别人的带宽")
private BigDecimal delegatedBandwidthValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我带宽的trx数量 */
+ @Excel(name = "别人代理给我带宽的trx数量")
private Long acquiredDelegatedBandwidthTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我的带宽 */
+ @Excel(name = "别人代理给我的带宽")
private BigDecimal acquiredDelegatedBandwidthValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 质押的trx数量-不含代理 */
+ @Excel(name = "质押的trx数量-不含代理")
private Long stakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量质押的trx数量-不含代理 */
+ @Excel(name = "能量质押的trx数量-不含代理")
private Long energyStakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 带宽质押的trx数量-不含代理 */
+ @Excel(name = "带宽质押的trx数量-不含代理")
private Long bandwidthStakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 可投票数 */
+ @Excel(name = "可投票数")
private Long voteNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 已经投票数量 */
+ @Excel(name = "已经投票数量")
private Long votedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 质押还剩能用的带宽 */
+ @Excel(name = "质押还剩能用的带宽")
private Long bandwidthStakedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 质押带宽总额 */
+ @Excel(name = "质押带宽总额")
private Long bandwidthStakedAllNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 免费还剩能用的带宽 */
+ @Excel(name = "免费还剩能用的带宽")
private Long bandwidthFreeNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 免费带宽总额 */
+ @Excel(name = "免费带宽总额")
private Long bandwidthFreeAllNum;
- public void setId(Long id)
+ public String getTokenKey() {
+ return tokenKey;
+ }
+
+ public void setTokenKey(String tokenKey) {
+ this.tokenKey = tokenKey;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
@@ -243,15 +253,6 @@ public class WalletAddress extends BaseEntity
{
return tokenIndex;
}
- public void setTokenKey(String tokenKey)
- {
- this.tokenKey = tokenKey;
- }
-
- public String getTokenKey()
- {
- return tokenKey;
- }
public void setUsdtBalance(BigDecimal usdtBalance)
{
this.usdtBalance = usdtBalance;
@@ -473,7 +474,6 @@ public class WalletAddress extends BaseEntity
.append("userId", getUserId())
.append("walletUserName", getWalletUserName())
.append("tokenIndex", getTokenIndex())
- .append("tokenKey", getTokenKey())
.append("usdtBalance", getUsdtBalance())
.append("trxBalance", getTrxBalance())
.append("energyNum", getEnergyNum())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java
index 4b357ad..1ba43c0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
/**
- * 【请填写功能名称】对象 wallet_address
+ * 钱包对象 wallet_address
*
* @author luqj
* @date 2026-09-26
@@ -23,111 +23,123 @@ public class WalletAddressPlus implements Serializable
/** $column.columnComment */
private Long id;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 钱包token */
+ @Excel(name = "钱包token")
private String token;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 1:启用 2:禁用 */
+ @Excel(name = "1:启用 2:禁用")
private Long status;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdAt;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date updatedAt;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "1:启用 2:禁用", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** appId */
+ @Excel(name = "appId")
private Long appId;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** userId */
+ @Excel(name = "userId")
private Long userId;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 钱包所属用户,通过接口传入 */
+ @Excel(name = "钱包所属用户,通过接口传入")
private String walletUserName;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 子账号对应的索引位置 */
+ @Excel(name = "子账号对应的索引位置")
private String tokenIndex;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String tokenKey;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** usdt余额 */
+ @Excel(name = "usdt余额")
private BigDecimal usdtBalance;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "usdt余额")
private BigDecimal trxBalance;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量-可用 */
+ @Excel(name = "能量-可用")
private Long energyNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量总额 */
+ @Excel(name = "能量总额")
private Long energyAllNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量-已用 */
+ @Excel(name = "能量-已用")
private Long energyUsedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 带宽-可用 */
+ @Excel(name = "带宽-可用")
private Long bandwidthNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人能量的trx数量 */
+ @Excel(name = "代理给别人能量的trx数量")
private Long delegatedEnergyTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的能量 */
+ @Excel(name = "代理给别人的能量")
private BigDecimal delegatedEnergyValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我能量的trx数量 */
+ @Excel(name = "别人代理给我能量的trx数量")
private Long acquiredDelegatedEnergyTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我的能量 */
+ @Excel(name = "别人代理给我的能量")
private BigDecimal acquiredDelegatedEnergyValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的带宽trx数量 */
+ @Excel(name = "代理给别人的带宽trx数量")
private Long delegatedBandwidthTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 代理给别人的带宽 */
+ @Excel(name = "代理给别人的带宽")
private BigDecimal delegatedBandwidthValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我带宽的trx数量 */
+ @Excel(name = "别人代理给我带宽的trx数量")
private Long acquiredDelegatedBandwidthTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 别人代理给我的带宽 */
+ @Excel(name = "别人代理给我的带宽")
private BigDecimal acquiredDelegatedBandwidthValue;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 质押的trx数量-不含代理 */
+ @Excel(name = "质押的trx数量-不含代理")
private Long stakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 能量质押的trx数量-不含代理 */
+ @Excel(name = "能量质押的trx数量-不含代理")
private Long energyStakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 带宽质押的trx数量-不含代理 */
+ @Excel(name = "带宽质押的trx数量-不含代理")
private Long bandwidthStakedTrxNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 可投票数 */
+ @Excel(name = "可投票数")
private Long voteNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 已经投票数量 */
+ @Excel(name = "已经投票数量")
private Long votedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
+ @Excel(name = "token key")
+ private String tokenKey;
+
+ /** 质押还剩能用的带宽 */
+ @Excel(name = "质押还剩能用的带宽")
private Long bandwidthStakedNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 质押带宽总额 */
+ @Excel(name = "质押带宽总额")
private Long bandwidthStakedAllNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 免费还剩能用的带宽 */
+ @Excel(name = "免费还剩能用的带宽")
private Long bandwidthFreeNum;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ /** 免费带宽总额 */
+ @Excel(name = "免费带宽总额")
private Long bandwidthFreeAllNum;
public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public String getTokenKey() {
+ return tokenKey;
+ }
+
+ public void setTokenKey(String tokenKey) {
+ this.tokenKey = tokenKey;
+ }
+
+ public Long getId()
{
return id;
}
@@ -212,15 +224,6 @@ public class WalletAddressPlus implements Serializable
{
return tokenIndex;
}
- public void setTokenKey(String tokenKey)
- {
- this.tokenKey = tokenKey;
- }
-
- public String getTokenKey()
- {
- return tokenKey;
- }
public void setUsdtBalance(BigDecimal usdtBalance)
{
this.usdtBalance = usdtBalance;
@@ -442,7 +445,6 @@ public class WalletAddressPlus implements Serializable
.append("userId", getUserId())
.append("walletUserName", getWalletUserName())
.append("tokenIndex", getTokenIndex())
- .append("tokenKey", getTokenKey())
.append("usdtBalance", getUsdtBalance())
.append("trxBalance", getTrxBalance())
.append("energyNum", getEnergyNum())
diff --git a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml
index da97202..2a60144 100644
--- a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml
@@ -38,10 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select id, token, status, created_at, updated_at, deleted_at, app_id, user_id, wallet_user_name, token_index, usdt_balance, trx_balance, energy_num, energy_all_num, energy_used_num, bandwidth_num, delegated_energy_trx_num, delegated_energy_value, acquired_delegated_energy_trx_num, acquired_delegated_energy_value, delegated_bandwidth_trx_num, delegated_bandwidth_value, acquired_delegated_bandwidth_trx_num, acquired_delegated_bandwidth_value, staked_trx_num, energy_staked_trx_num, bandwidth_staked_trx_num, vote_num, voted_num, bandwidth_staked_num, bandwidth_staked_all_num, bandwidth_free_num, bandwidth_free_all_num from wallet_address
+ select id, token, status, created_at,token_key, updated_at, deleted_at, app_id, user_id, wallet_user_name, token_index, usdt_balance, trx_balance, energy_num, energy_all_num, energy_used_num, bandwidth_num, delegated_energy_trx_num, delegated_energy_value, acquired_delegated_energy_trx_num, acquired_delegated_energy_value, delegated_bandwidth_trx_num, delegated_bandwidth_value, acquired_delegated_bandwidth_trx_num, acquired_delegated_bandwidth_value, staked_trx_num, energy_staked_trx_num, bandwidth_staked_trx_num, vote_num, voted_num, bandwidth_staked_num, bandwidth_staked_all_num, bandwidth_free_num, bandwidth_free_all_num from wallet_address
@@ -122,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bandwidth_staked_all_num,
bandwidth_free_num,
bandwidth_free_all_num,
+ token_key,
#{token},
@@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{bandwidthStakedAllNum},
#{bandwidthFreeNum},
#{bandwidthFreeAllNum},
+ #{tokenKey},
@@ -194,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bandwidth_staked_all_num = #{bandwidthStakedAllNum},
bandwidth_free_num = #{bandwidthFreeNum},
bandwidth_free_all_num = #{bandwidthFreeAllNum},
+ token_key = #{tokenKey},
where id = #{id}