| src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-test.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/logback-spring.xml | ●●●●● patch | view | raw | blame | history |
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -30,12 +30,14 @@ import java.math.RoundingMode; import java.util.*; /** * @author helius */ @Service public class OrderWebsocketServiceImpl { @Resource ContractHoldOrderService contractHoldOrderService; @Resource ContractOrderService contractOrderService; @@ -43,10 +45,8 @@ @Resource ContractEntrustOrderService contractEntrustOrderService; @Resource MemberWalletContractService memberWalletContractService; @Resource CacheSettingUtils cacheSettingUtils; @@ -62,7 +62,6 @@ @Resource private MemberAccountFlowEntityDao memberAccountFlowEntityDao; public void dealOrderFromMq(List<OrderModel> list, Integer type) { @@ -93,6 +92,8 @@ break; case 12: this.dealForLessLoss(coinsCoinsOrders,list); break; default: break; } @@ -528,7 +529,7 @@ .setScale(8, BigDecimal.ROUND_DOWN); contractHoldOrderEntity.setOpeningFeeAmount(openFeePrice); contractHoldOrderEntity.setVersion(1); BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(coinsCoinsOrder.getBondAmount(), entrustPrice, symbolCnt, lotNumber, type, memberEntity); BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(coinsCoinsOrder.getBondAmount().subtract(openFeePrice), entrustPrice, symbolCnt, lotNumber, type, memberEntity); contractHoldOrderEntity.setForceClosingPrice(forceSetPrice); contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio()); @@ -653,8 +654,6 @@ record.setSymbol(coinsOrder.getSymbol()); record.setPrice(coinsOrder.getPrePaymentAmount()); memberAccountFlowEntityDao.insert(record); } } } src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java
@@ -43,10 +43,10 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_MOREPRO) public void onMessageMorePro(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了开多止盈：" + content); log.info("==message-price-consumer==我收到消息了开多止盈 : {}", content); List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 TODO //orderWebsocketService.dealOrderFromMq(list,9); // 开始处理 orderWebsocketService.dealOrderFromMq(list, 9); } // 1：买入委托2：开多3:开空4：平多5：平空6:爆仓平多7:爆仓平空8:撤单9:止盈平多10：止盈平空11：止损平多12：止损平空 @@ -59,11 +59,11 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_LESSPRO) public void onMessageLessPro(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了开空止盈：" + content); log.info("==message-price-consumer==我收到消息了开空止盈 : {}", content); // 开始处理 List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 //orderWebsocketService.dealOrderFromMq(list,10); orderWebsocketService.dealOrderFromMq(list, 10); } @@ -76,11 +76,11 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_MORELOSS) public void onMessageMoreLoss(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了开多止损：" + content); log.info("==message-price-consumer==我收到消息了开多止损 : {}", content); // 开始处理 List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 //orderWebsocketService.dealOrderFromMq(list,11); orderWebsocketService.dealOrderFromMq(list, 11); } /** @@ -92,11 +92,11 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_LESSLOSS) public void onMessageLessLoss(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了开空止损：" + content); log.info("==message-price-consumer==我收到消息了开空止损 : {}", content); // 开始处理 List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 //orderWebsocketService.dealOrderFromMq(list,12); orderWebsocketService.dealOrderFromMq(list, 12); } /** @@ -108,11 +108,11 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_LIMIT) public void onMessageLimit(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了限价委托：" + content); log.info("==message-price-consumer==我收到消息了限价委托 : {}", content); // 开始处理 List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 //orderWebsocketService.dealForLimitMq(list); orderWebsocketService.dealForLimitMq(list); } /** @@ -124,11 +124,11 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_COINOUT) public void onMessageCoinout(Message message, Channel channel) { String content = new String(message.getBody()); System.out.println("我收到消息了爆仓：" + content); log.info("==message-price-consumer==我收到消息了爆仓 : {}", content); // 开始处理 List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class); // 开始处理 //orderWebsocketService.dealOrderFromMq(list,6); orderWebsocketService.dealOrderFromMq(list, 6); } /** @@ -140,7 +140,7 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_CLOSETRADE) public void onMessageCloseTrade(Message message, Channel channel) { String content = new String(message.getBody()); log.info("我收到消息了平仓: {}", content); log.info("==message-price-consumer==我收到消息了平仓: {}", content); // 订单 List<Long> ids = JSONArray.parseArray(content, Long.class); orderService.cancelHoldOrder(ids); src/main/resources/application-test.yml
@@ -93,9 +93,10 @@ app: debug: true redis_expire: 3000 kline-update-job: true newest-price-update-job: true other-job: true kline-update-job: false newest-price-update-job: false other-job: false rabbit-consumer: false aliyun: oss: src/main/resources/application.yml
@@ -99,7 +99,7 @@ newest-price-update-job: false #其他任务控制 other-job: false rabbit-consumer: true rabbit-consumer: false aliyun: oss: src/main/resources/logback-spring.xml
@@ -2,7 +2,8 @@ <configuration> <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 --> <property name="log.path" value="logs" /> <property name="log.path" value="/home/javaweb/log/new-excoin" /> <!-- <springProperty scope="context" name="log.path" source="logging.file.path"/>--> <!-- 彩色日志 --> <!-- 彩色日志依赖的渲染类 --> @@ -28,7 +29,7 @@ <!-- 时间滚动输出 level为 DEBUG 日志 --> <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <!-- 正在记录的日志文件的路径及文件名 --> <file>${log.path}/log_debug.log</file> <file>${log.path}/debug/log_debug.log</file> <!--日志文件输出格式--> <encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{50} - %msg%n</pattern> @@ -55,7 +56,7 @@ <!-- 时间滚动输出 level为 INFO 日志 --> <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <!-- 正在记录的日志文件的路径及文件名 --> <file>${log.path}/log_info.log</file> <file>${log.path}/info/log_info.log</file> <!--日志文件输出格式--> <encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{50} - %msg%n</pattern> @@ -82,7 +83,7 @@ <!-- 时间滚动输出 level为 WARN 日志 --> <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <!-- 正在记录的日志文件的路径及文件名 --> <file>${log.path}/log_warn.log</file> <file>${log.path}/warn/log_warn.log</file> <!--日志文件输出格式--> <encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{50} - %msg%n</pattern> @@ -109,7 +110,7 @@ <!-- 时间滚动输出 level为 ERROR 日志 --> <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <!-- 正在记录的日志文件的路径及文件名 --> <file>${log.path}/log_error.log</file> <file>${log.path}/error/log_error.log</file> <!--日志文件输出格式--> <encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{50} - %msg%n</pattern>
