From 847dbe9dd150dc3eba88776864fb39c5cc8f0741 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Mar 2022 16:28:51 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 53321f3..4810ab1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -3,8 +3,12 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.entity.DappMineDataEntity;
+import cc.mrbird.febs.dapp.entity.DappReturnRatioEntity;
+import cc.mrbird.febs.dapp.mapper.DappReturnRatioDao;
import cc.mrbird.febs.dapp.mapper.DappSystemDao;
import cc.mrbird.febs.dapp.service.DappSystemService;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,8 +29,10 @@
public class DappSystemServiceImpl implements DappSystemService {
private final DappSystemDao dappSystemDao;
+ private final DappReturnRatioDao dappReturnRatioDao;
private final RedisUtils redisUtils;
+ private final String[] ADDRESS_PREFIX = {"T", "0x"};
@Override
public Map<String, Object> findTotalInComeAndList() {
DappMineDataEntity dataMine = dappSystemDao.selectMineDataForOne();
@@ -34,8 +40,19 @@
List<Map<String, Object>> incomeList = new ArrayList<>();
for (int i = 0; i < 15; i++) {
Map<String, Object> incomeItem = new HashMap<>();
- incomeItem.put("address", "TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD");
- incomeItem.put("income", 0.313241234);
+ int index = RandomUtil.randomInt(1, 10);
+ String prefix = ADDRESS_PREFIX[index % 2];
+ int length = 0;
+ if ("T".equals(prefix)) {
+ length = 33;
+ } else {
+ length = 40;
+ }
+
+ String address = prefix + RandomUtil.randomString(length);
+
+ incomeItem.put("address", StrUtil.hide(address, 4, address.length() - 4));
+ incomeItem.put("income", RandomUtil.randomBigDecimal(new BigDecimal("0.001"), new BigDecimal("2")));
incomeList.add(incomeItem);
}
@@ -50,9 +67,11 @@
BigDecimal newPrice = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_ETH_NEW_PRICE);
Integer changeFee = (Integer) redisUtils.get(AppContants.REDIS_KEY_CHANGE_FEE);
+ List<DappReturnRatioEntity> ratios = dappReturnRatioDao.selectList(null);
Map<String, Object> result = new HashMap<>();
result.put("newPrice", newPrice);
result.put("changeFee", changeFee);
+ result.put("ratio", ratios);
return result;
}
}
--
Gitblit v1.9.1