From ecadb549d8a0009357e0846dd5a22214a60466a8 Mon Sep 17 00:00:00 2001 From: KevinHuangwl Date: Sun, 9 Jun 2024 13:38:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/northstar/common/model/ComponentMetaInfo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/northstar-api/src/main/java/org/dromara/northstar/common/model/ComponentMetaInfo.java b/northstar-api/src/main/java/org/dromara/northstar/common/model/ComponentMetaInfo.java index cefd69fd..860d4a97 100644 --- a/northstar-api/src/main/java/org/dromara/northstar/common/model/ComponentMetaInfo.java +++ b/northstar-api/src/main/java/org/dromara/northstar/common/model/ComponentMetaInfo.java @@ -1,12 +1,14 @@ package org.dromara.northstar.common.model; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Data +@Builder public class ComponentMetaInfo { private String name; -- Gitee From 9b7a8e49b7e4c30e527a381c5fcf038fdf1e667b Mon Sep 17 00:00:00 2001 From: KevinHuangwl Date: Sun, 9 Jun 2024 16:25:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../northstar/common/utils/TradeHelper.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/northstar-api/src/main/java/org/dromara/northstar/common/utils/TradeHelper.java b/northstar-api/src/main/java/org/dromara/northstar/common/utils/TradeHelper.java index 136c13cb..0a980736 100644 --- a/northstar-api/src/main/java/org/dromara/northstar/common/utils/TradeHelper.java +++ b/northstar-api/src/main/java/org/dromara/northstar/common/utils/TradeHelper.java @@ -152,6 +152,7 @@ public class TradeHelper { * 反手买 * @param vol */ + @Deprecated public void buyReverse(int vol) { logger.info("反手买"); doAction(SignalOperation.BUY_REVERSE, vol); @@ -160,10 +161,27 @@ public class TradeHelper { * 反手卖 * @param vol */ + @Deprecated public void sellReverse(int vol) { logger.info("反手卖"); doAction(SignalOperation.SELL_REVERSE, vol); } + /** + * 反手买 + * @param vol + */ + public void doBuyReverse(int vol) { + logger.info("反手买"); + doAction(SignalOperation.BUY_REVERSE, vol); + } + /** + * 反手卖 + * @param vol + */ + public void doSellReverse(int vol) { + logger.info("反手卖"); + doAction(SignalOperation.SELL_REVERSE, vol); + } private void doAction(SignalOperation operation, double price, int vol, long timeout, Predicate priceDiffConditionToAbort) { context.submitOrderReq(TradeIntent.builder() -- Gitee From d74ca7586b9a5ac5a4156841cce49eb3de732f65 Mon Sep 17 00:00:00 2001 From: KevinHuangwl Date: Mon, 10 Jun 2024 09:28:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E6=B5=8B?= =?UTF-8?q?=E6=97=B6=E9=99=90=E4=BB=B7=E5=8D=95=E4=BB=B7=E6=A0=BC=E4=B8=BA?= =?UTF-8?q?=E9=9B=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../northstar/module/PlaybackModuleContext.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/northstar-main/src/main/java/org/dromara/northstar/module/PlaybackModuleContext.java b/northstar-main/src/main/java/org/dromara/northstar/module/PlaybackModuleContext.java index e399c051..70f3d743 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/module/PlaybackModuleContext.java +++ b/northstar-main/src/main/java/org/dromara/northstar/module/PlaybackModuleContext.java @@ -53,13 +53,13 @@ public class PlaybackModuleContext extends ModuleContext implements IModuleConte // 回测时直接成交，没有撤单追单逻辑 SignalOperation operation = tradeIntent.getOperation(); if(operation == SignalOperation.BUY_REVERSE) { - submitOrderReq(tradeIntent.getContract(), SignalOperation.BUY_CLOSE, tradeIntent.getPriceType(), tradeIntent.getVolume(), 0); - submitOrderReq(tradeIntent.getContract(), SignalOperation.BUY_OPEN, tradeIntent.getPriceType(), tradeIntent.getVolume(), 0); + submitOrderReq(tradeIntent.getContract(), SignalOperation.BUY_CLOSE, tradeIntent.getPriceType(), tradeIntent.getVolume(), tradeIntent.getPrice()); + submitOrderReq(tradeIntent.getContract(), SignalOperation.BUY_OPEN, tradeIntent.getPriceType(), tradeIntent.getVolume(), tradeIntent.getPrice()); } else if (operation == SignalOperation.SELL_REVERSE) { - submitOrderReq(tradeIntent.getContract(), SignalOperation.SELL_CLOSE, tradeIntent.getPriceType(), tradeIntent.getVolume(), 0); - submitOrderReq(tradeIntent.getContract(), SignalOperation.SELL_OPEN, tradeIntent.getPriceType(), tradeIntent.getVolume(), 0); + submitOrderReq(tradeIntent.getContract(), SignalOperation.SELL_CLOSE, tradeIntent.getPriceType(), tradeIntent.getVolume(), tradeIntent.getPrice()); + submitOrderReq(tradeIntent.getContract(), SignalOperation.SELL_OPEN, tradeIntent.getPriceType(), tradeIntent.getVolume(), tradeIntent.getPrice()); } else { - submitOrderReq(tradeIntent.getContract(), tradeIntent.getOperation(), tradeIntent.getPriceType(), tradeIntent.getVolume(), 0); + submitOrderReq(tradeIntent.getContract(), tradeIntent.getOperation(), tradeIntent.getPriceType(), tradeIntent.getVolume(), tradeIntent.getPrice()); } } -- Gitee From 4161caa2b5c791d7e3ad89ba141478827f1e6c9d Mon Sep 17 00:00:00 2001 From: KevinHuangwl Date: Mon, 10 Jun 2024 09:45:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- northstar-monitor/electron-egg/package.json | 2 +- northstar-monitor/package-lock.json | 2 +- northstar-monitor/package.json | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/northstar-monitor/electron-egg/package.json b/northstar-monitor/electron-egg/package.json index 3c5ab8d6..f960cfb1 100644 --- a/northstar-monitor/electron-egg/package.json +++ b/northstar-monitor/electron-egg/package.json @@ -1,6 +1,6 @@ { "name": "northstar-desktop", - "version": "7.3.1", + "version": "7.3.2", "description": "A fast, desktop software development framework", "main": "main.js", "scripts": { diff --git a/northstar-monitor/package-lock.json b/northstar-monitor/package-lock.json index b63be620..8a5e81a4 100644 --- a/northstar-monitor/package-lock.json +++ b/northstar-monitor/package-lock.json @@ -1,6 +1,6 @@ { "name": "northstar-monitor", - "version": "7.3.1", + "version": "7.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/northstar-monitor/package.json b/northstar-monitor/package.json index 9c2cca7b..fe474670 100644 --- a/northstar-monitor/package.json +++ b/northstar-monitor/package.json @@ -1,6 +1,6 @@ { "name": "northstar-monitor", - "version": "7.3.1", + "version": "7.3.2", "private": true, "main": "electron/main.js", "scripts": { diff --git a/pom.xml b/pom.xml index c0bfadba..eec09ba8 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ https://gitee.com/dromara/northstar - 7.3.1 + 7.3.2 21 -Dfile.encoding=UTF-8 UTF-8 -- Gitee