fix(indicator): 修复MACD指标计算和策略逻辑错误

Administrator

2025-12-26 40cb1017c99fca2809fc1aaea4361b2bf0c6e4a2

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
Êþº¾4
c±²

³´
?µ
Q¶    ?·    ?¸    ?¹    ?º    ?»    ?¼    n½    ?¾    
¿    ?À    ?ÁÂÃ
ÄÅÆ
Ç
ÈÉÂÊ
Ë
Ì
Í
?Π   nÏ
ÐÑ
?Ò    nÓ
?Ô
?ÕÖ×Ø
"ÙÚÛ
ÜÝÞ
)ß
)à

á
)â
?ã
?ä
åæ
?ç
?è
?é
?ê
)ë
)ì

íîï    
ð

ñ

ò

ó
?ôõ
?¶ö
A¶÷?à

øÂù    Ðúû
üýþÿ?ə™™™™š
?



    


 
?

n

"

    
ü

 
"

 
"







a¶

a

a


?

a


?

a

TradingOrder
InnerClasses

PositionType
shortPeriod

I

longPeriod
signalPeriod
volatilityPeriod
 stopLossRatio
Ljava/math/BigDecimal;
takeProfitRatio
currentPosition
]Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$PositionType;

entryPrice
    entryTime

J
<init>
()V
Code
LineNumberTable
3(IIIILjava/math/BigDecimal;Ljava/math/BigDecimal;)V
analyze
o(Ljava/util/List;)Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$PositionType;
 StackMapTable
Ʊ
    Signature
‡(Ljava/util/List<Ljava/math/BigDecimal;>;)Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$PositionType;
generateTradingOrder
o(Ljava/util/List;)Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$TradingOrder;

‡(Ljava/util/List<Ljava/math/BigDecimal;>;)Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$TradingOrder;
isLongEntryCondition
u(Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult;Ljava/util/List;Ljava/math/BigDecimal;)Z
Þ
(Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult;Ljava/util/List<Ljava/math/BigDecimal;>;Ljava/math/BigDecimal;)Z
isShortEntryConditionõ
shouldClosePosition
isEmaGoldenCross
O(Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult;)Z
isEmaDeathCross
isMacdGoldenCrossAndExpanding
isMacdDeathCrossAndContracting
isVolatilityInRange
(Ljava/math/BigDecimal;)Z
isStopLossTriggered
isTakeProfitTriggered
isMacdReversalSignal
getCurrentPosition
_()Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$PositionType;
 getEntryPrice
()Ljava/math/BigDecimal;
getEntryTime
()J
reset
main
([Ljava/lang/String;)V
 Ö
!
"
#


SourceFile
MacdMaStrategy.java
java/math/BigDecimal
0.01}
$
0.02}}~pqrqsqtquvwv
%yxy
&vzv{|

'
(
)
*
+
Jcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/Volatility}
,
-
.
/
0
1
2
3
4~
5£Ž
6y
7
8¥“
9y•‚ƒ
[com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$TradingOrder
buy
long}
:
sell
short

;
<
Icom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/PriceData
=£
>£
?
@
A£˜—š—
B
C
D›œœžœŸ—
E£
F£
G£
0.1
5.0
Hv
I
J
K
J
L
J™—
Ncom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy
java/util/ArrayList
100.00}
M
L
N
O
P
-===== MACD和MA组合交易策略示例 =====
!
Q
$
0开始处理价格数据并生成交易信号...
125.00Š‹
/ä»·æ ¼: %s, å½“前持仓: %s, äº¤æ˜“指令: %s

java/lang/Object
R
S
T
U
V ¡
W
X
Y
X
无交易指令
Z
[
\
X
"
]
N
^
X
[交易操作] ä¹°å…¥å¼€å¤š
[交易操作] å–出开空
[交易操作] å–出平多
[交易操作] ä¹°å…¥å¹³ç©º

===== ç­–略最终状态 =====
java/lang/StringBuilder
当前持仓: 
_
`
开仓价格: ¢£
_
a
开仓时间戳: ¤¥
_
b
[com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy$PositionType
Jcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult
java/util/List
[Ljava/lang/String;
java/io/PrintStream
java/lang/String
[Ljava/lang/Object;
(Ljava/lang/String;)V
NONE
ZERO
size
()I
Ncom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDCalculator
 calculateMACD
a(Ljava/util/List;III)Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult;
(I)V
java/lang/Math
max
(II)I
get
(I)Ljava/lang/Object;
addPrice
(Ljava/math/BigDecimal;)V
    calculate
getValue
LONG
java/lang/System
currentTimeMillis
SHORT
'(Ljava/lang/String;Ljava/lang/String;)V
getMacdData
()Ljava/util/List;
getEmaShort

getEmaLong
    compareTo
(Ljava/math/BigDecimal;)I
getMacdHist
Ucom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/BearishSignalDetector
isBearishSignalFormed
_(Lcom/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MACDResult;Ljava/util/List;)Z
getDif
getDea
abs
ONE
subtract
.(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
multiply
add
(D)V
(Ljava/lang/Object;)Z
out
Ljava/io/PrintStream;
println
java/math/RoundingMode
HALF_UP
Ljava/math/RoundingMode;
setScale
1(ILjava/math/RoundingMode;)Ljava/math/BigDecimal;
name
()Ljava/lang/String;
toString
printf
<(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream;
getSide
equals

getPosSide
append
-(Ljava/lang/String;)Ljava/lang/StringBuilder;
-(Ljava/lang/Object;)Ljava/lang/StringBuilder;
(J)Ljava/lang/StringBuilder;!?Q    pqrqsqtquvwvxyzv{|
}~
;    
*    »
Y·»
Y··±
€
45
}
y9*·*µ*µ*µ    *µ
*µ*µ*² µ*²µ*    µ±
€.BC    DEFGH%K,L3M8N
‚ƒ
¥ý+Æ+¹
"¢² °+*´*´*´    ¸M»Y*´
·N+¹
*´
d¸6+¹
¢-+¹À
¶„
§ÿã-¶++¹
d¹À
:*´² ¦Q*,+-¶·™*²µ*µ*¸µ²°*,+-¶·™*²µ*µ*¸µ²°² °*,+· ™ *´:*² µ*²µ*    µ² °*´°€vXY]$a0bAcLd[cafeixl‚np–qœr£s§w´y»zÁ{È|̀Ѓۅá†è‡ïˆô‰ø„þ-…†
úüE‡$'ˆ‰
Š‹¼k*+¶!M,²¦»"Y#$·%°,²¦»"Y&'·%°,² ¦9*´² ¥/*´²¦»"Y&$·%°*´²¦»"Y#'·%°
°€.²µ ·¸ º,»=½G¿SÀ]ÂiDŽüŒ&ˆŽÖ    z+¶(:¹
¢¬¹
d¹À):¶*¶+¶,ž§6¶-²¶,ž§6-²¶,ž§6™™™§¬€"ÔÕÖÙ(Ú?ÝTàeã„"    üü(‘@
ü
@
ü
@
ü
@
ˆ’“6*+·.6*+·/6+,¸06*-·16™™™™§¬€ñô÷úý„ÿ4”…‡



@
ˆ’•[ *-·2™¬*-·3™¬*+·4™¬¬€







„
        ˆ’–—
§Z+¶(M,¹
¢¬,,¹
d¹À)N,,¹
d¹À):-¶*-¶+¶,ž¶*¶+¶,§¬€"
#
$
%
(#
)6
,F
-Y
,„üýF‘‘@
˜—
§Z+¶(M,¹
¢¬,,¹
d¹À)N,,¹
d¹À):-¶*-¶+¶,œ¶*¶+¶,›§¬€"
7
8
9
<#
=6
@F
AY
@„üýF‘‘@
™—

±+¶(M,¹
¢¬,,¹
d¹À)N,,¹
d¹À):,,¹
d¹À):¶5¶6¶,-¶5-¶6¶,ž§6¶-¶-¶,#¶--¶-¶,œ-¶-²¶,ž§6™™§¬€2
K
L
M
P#
Q6
RI
UZ
Vn
Y€
ZŽ
[¡
]„"üþY‘‘‘@
ü1
@
ü
@
š—

9½+¶(M,¹
¢¬,,¹
d¹À)N,,¹
d¹À):,,¹
d¹À):¶5¶6¶,›-¶5-¶6¶,œ§6¶-¶7¶-¶7¶,›)¶-¶7-¶-¶7¶,ž-¶-²¶,œ§6™™§¬€B
g
h
i
l#
m6
nI
qZ
rn
ux
v~
u†
w
x“
wš
y­
{„"üþY‘‘‘@
ü=
@
ü
@
›œ
e*»
Y8·M»
Y9·N+,¶,›+-¶,§¬€
…

†
ˆ
‰)
ˆ„ ý(‡‡@
œ
Ìe*´²¶,š¬*´²¦#*´²:*´¶;¶<M+,¶,œ§¬*´²¦#*´²:*´¶=¶<M+,¶,ž§¬¬€6 
“ 
”
—
™$
š'
™+
›9
œC
žN
ŸQ
žU
 c
£„ü'‡@
úü'‡@
úžœ
Ìe*´²¶,š¬*´²¦#*´²:*´¶=¶<M+,¶,ž§¬*´²¦#*´²:*´¶;¶<M+,¶,œ§¬¬€6 
­ 
®
±
³$
´'
³+
µ9
¶C
¸N
¹Q
¸U
ºc
½„ü'‡@
úü'‡@
úŸ—
T"*´²¦    *+·/¬*´²¦    *+·>¬¬€
Ç

É
Ê
Ì 
τ
 ¡


*´°
€

Ø
¢£


*´°
€

á
¤¥

*´­
€

ê
¦~
8
*² µ*²µ*    µ±
€
ñ
ò
ó
ô    §¨
¯
²»?Y·@L»AY·BM>2¢),»
YC·»
Y‡Dk·F¶=¹GW„
§ÿײHI¶J²HK¶J>¢ÿ»
YL·»
Y‡Mk·F¶=:,¹GW+,¶O:²HP½QY²R¶SSY+¶T¶USYƶV§WS¶XWƔ¶Y#¶Z™¶[$¶Z™²H\¶J§o¶Y&¶Z™¶['¶Z™²H]¶J§J¶Y&¶Z™¶[$¶Z™²H^¶J§%¶Y#¶Z™¶['¶Z™²H_¶J„
§ÿ
²H`¶J²H»aY·bc¶d+¶T¶U¶d¶e¶J²H»aY·bf¶d+¶g¶h¶e¶J²H»aY·bi¶d+¶j¶k¶e¶J±€~
ý8>
FNVqz’™©²¶»Õà ú!
"
#
*$
D%
L
R+
Z,
y-
•.
±/„g
þ”
ú+ü
ÿ^©”
‡ª«¬­­
ÿ
©”
‡ª«¬­­
®.$$ù!ú¯°m"?l    n?o@