From 44a6418f8a497f57ad59ed7915b7b79b78b9ecd0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 02 Sep 2020 18:25:42 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/SpringContextHolder.java | 1 +
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 4 ++--
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 4 ++++
src/main/resources/application.yml | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 54a64c4..cbe4e13 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -213,7 +213,7 @@
int i = contractEntrustOrderDao.insert(entrustOrderEntity);
memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
if (i > 0) {
- CalculateUtil.getForceSetPriceForWhole(submitEntrustDto.getSymbol(), memberEntity);
+ ThreadPoolUtils.sendWholeForceClosingPrice(submitEntrustDto.getSymbol(), memberEntity);
// 发送委托单队列消息
if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
@@ -286,7 +286,7 @@
if (i > 0) {
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == entrustOrderEntity.getPositionType()) {
- CalculateUtil.getForceSetPriceForWhole(entrustOrderEntity.getSymbol(), memberEntity);
+ ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrderEntity.getSymbol(), memberEntity);
}
return Result.ok(MessageSourceUtils.getString("cancellation_success"));
}
diff --git a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
index f184fea..bdca53a 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -12,10 +12,12 @@
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.ThreadPoolUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -31,6 +33,7 @@
* @author helius
*/
@Slf4j
+@DependsOn("springContextHolder")
@Component
@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job", havingValue = "true")
public class OrderProducerInit {
@@ -136,6 +139,7 @@
memberEntity = memberDao.selectById(memberId);
}
+// ThreadPoolUtils.sendWholeForceClosingPrice(symbol, memberEntity);
CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
}
}
diff --git a/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java b/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
index 857d02c..1efd890 100644
--- a/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
+++ b/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
@@ -61,6 +61,7 @@
if (SpringContextHolder.applicationContext != null) {
log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
}
+ log.info("=====================");
SpringContextHolder.applicationContext = applicationContext;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ffca27b..47d12ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -99,7 +99,7 @@
# k线更新任务控制
kline-update-job: false
#最新价任务控制
- newest-price-update-job: false
+ newest-price-update-job: true
#日线 该任务不能与最新价处于同一个服务器
day-line: false
#其他任务控制
--
Gitblit v1.9.1