From 4a1e4abf6ed1deafdb293d3aa85d099ef5c63a1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jun 2022 11:28:23 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/job/SystemTradeJob.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
index d1b5ec2..3cb70b3 100644
--- a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
+++ b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
@@ -4,6 +4,8 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
+import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
+import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.vo.RedisTransferPoolVo;
import lombok.extern.slf4j.Slf4j;
@@ -11,6 +13,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -26,11 +29,11 @@
private RedisUtils redisUtils;
@Autowired
private DappSystemService systemService;
+ @Resource
+ private DataDictionaryCustomMapper dataDictionaryCustomMapper;
// 最低容量(百分比)
private final BigDecimal volProp = new BigDecimal("0.5");
-
- private final BigDecimal basic_vol = BigDecimal.valueOf(1200000);
/**
* 中转池容量计算
@@ -44,10 +47,21 @@
@Scheduled(cron = "0 0 0 * * ?")
public void transferPoolVol() {
log.info("中转池容量");
+
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (!"start".equals(hasStart)) {
+ log.info("系统未启动");
+ return;
+ }
+
+ // 源池初始化容量
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_SOURCE_POOL_VOL);
+ BigDecimal basicVol = new BigDecimal(dic.getValue());
+
Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
if (o == null) {
RedisTransferPoolVo transferPool= new RedisTransferPoolVo();
- BigDecimal total = basic_vol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+ BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
transferPool.setTodayVol(total);
transferPool.setTodayProp(volProp);
transferPool.setFinishCnt(0);
@@ -77,7 +91,7 @@
transferPool.setFinishCnt(finishCnt);
}
- BigDecimal total = basic_vol.multiply(targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+ BigDecimal total = basicVol.multiply(targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
transferPool.setTodayVol(total);
transferPool.setUnFinishCnt(0);
redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
@@ -93,7 +107,7 @@
transferPool.setUnFinishCnt(unFinishCnt);
}
BigDecimal aa = targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP);
- BigDecimal total = basic_vol.multiply(aa);
+ BigDecimal total = basicVol.multiply(aa);
transferPool.setTodayVol(total);
redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
}
@@ -109,6 +123,12 @@
@Scheduled(cron = "0 0 0 * * ?")
public void sourcePoolUsdtOutLimit() {
log.info("源池每日出U限制");
+
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (!"start".equals(hasStart)) {
+ log.info("系统未启动");
+ return;
+ }
BigDecimal sourceBalance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
BigDecimal total = sourceBalance.multiply(BigDecimal.valueOf(0.1)).setScale(4, RoundingMode.HALF_DOWN);
@@ -124,6 +144,7 @@
*/
@Scheduled(cron = "0 0 2 * * ?")
public void mineJob() {
+ log.info("挖矿");
systemService.mining();
}
}
--
Gitblit v1.9.1