yangliu
040f3bd702
添加生产配置
|
2 mesiacov pred | |
|---|---|---|
| device-service-application | 2 mesiacov pred | |
| device-service-client-starter | 4 mesiacov pred | |
| device-service-common | 2 mesiacov pred | |
| device-service-domain | 2 mesiacov pred | |
| device-service-infrastructure | 2 mesiacov pred | |
| device-service-server | 2 mesiacov pred | |
| .gitignore | 4 mesiacov pred | |
| Dockerfile | 4 mesiacov pred | |
| Java类与Python文件映射关系.md | 3 mesiacov pred | |
| Jenkinsfile | 2 mesiacov pred | |
| OPC单元测试验证结果.md | 4 mesiacov pred | |
| OPC消息处理功能实现说明.md | 4 mesiacov pred | |
| README.md | 3 mesiacov pred | |
| RadarTimeSeriesService.java | 3 mesiacov pred | |
| pom.xml | 3 mesiacov pred | |
| 消息发送逻辑修正总结.md | 4 mesiacov pred |
README.md
# YceQ
gR ( D e v i c e A c c e s s S e r v i c e )
# # yv{N
YceQ
gR( D A S ) /f N*NWN J a v a S p r i n g B o o t b/ghg^vYceQs^S Ǒ(uWqR( D D D ) e(W:N
N T{|WvYcO~ Nv0SibU\vceQeHh0
gRǏ M Q T T OSNYۏLO [sYOo
Nb0rvc0̍PhKm0pNpencYtI{R0
# # yvgg
,gyvuWqR( D D D ) vRB\gg wQSORR:N
- * * ^(uB* * ( d e v i c e - s e r v i c e - a p p l i c a t i o n ) : #OSW
gR Yt^(u~+RvNR; YY}TNYt0NNOSTpenclbc0
- * * WB* * ( d e v i c e - s e r v i c e - d o m a i n ) : yvv8h S+TN@b gNR8h; YY[SO0pNYt0YƋ+R0W
gRTNPcS0
- * * W@xeB\* * ( d e v i c e - s e r v i c e - i n f r a s t r u c t u r e ) : cOb/g[s Ypenc^0M Q T T moYt0,{ Ne
gRcSv[s0
- * * (uB* * ( d e v i c e - s e r v i c e - c o m m o n ) : S+T!jWWv(u{| Y8^ϑ[IN0D T O [a0]wQ{|TMn0
- * * [7bz/TRhV* * ( d e v i c e - s e r v i c e - c l i e n t - s t a r t e r ) : :NvQN
gRcON,g
gRNNvF e i g n [7bz0
- * *
gR/TR* * ( d e v i c e - s e r v i c e - s e r v e r ) : S p r i n g B o o t ^(uveQS #~ňT/TRte*N
gR0
- * * P y t h o n S
gR* * ( d a s ) : (uN[kTvP y t h o n Hr,g[s cONJ a v a
gRI{NvR;0
# # # ggOVV
` m e r m a i d
g r a p h T D ;
s u b g r a p h " ^(uB\ A p p l i c a t i o n "
A [ " d e v i c e - s e r v i c e - a p p l i c a t i o n " ]
A 1 [ " c o n t r o l l e r < b r / > W e b / W A P c6RhV" ]
A 2 [ " s e r v i c e < b r / > ^(u
gRB\" ]
A 2 1 [ " D e v i c e C o m m a n d S e r v i c e " ]
A 2 2 [ " D e v i c e E v e n t S e r v i c e " ]
A 3 [ " c o n v e r t < b r / > penclbchV" ]
A 4 [ " d t o < b r / > penc O[a" ]
A 5 [ " t a s k < b r / > [eNR" ]
A - - S+T - - > A 1 & A 2 & A 3 & A 4 & A 5
A 2 - - S+T - - > A 2 1 & A 2 2
e n d
s u b g r a p h " WB\ D o m a i n "
B [ " d e v i c e - s e r v i c e - d o m a i n " ]
B 1 [ " e n t i t y < b r / > W[SO" ]
B 1 1 [ " D e v i c e < b r / > Y[SO" ]
B 1 2 [ " A l a r m P l a n < b r / > JTfR" ]
B 1 3 [ " B e h a v i o r P a t t e r n < b r / > L:N!j" ]
B 2 [ " s e r v i c e < b r / > W
gR" ]
B 2 1 [ " P o i n t C l o u d P r o c e s s S e r v i c e < b r / > pNYt
gR" ]
B 2 2 [ " A l a r m S e r v i c e < b r / > JTf
gR" ]
B 2 3 [ " D e v i c e S e r v i c e < b r / > Y
gR" ]
B 3 [ " p o r t / g a t e w a y < b r / > zScS" ]
B 3 1 [ " D e v i c e E v e n t P o r t < b r / > YNNzS" ]
B 3 2 [ " D e v i c e G a t e w a y < b r / > YQsQ" ]
B 3 3 [ " M q t t G a t e w a y < b r / > M Q T T QsQ" ]
B 4 [ " e v e n t < b r / > WNN" ]
B 4 1 [ " D e v i c e E v e n t < b r / > YNN" ]
B 4 2 [ " F a l l E v e n t < b r / > ̍PNN" ]
B 5 [ " v o < b r / > YRg~g" ]
B 5 2 [ " T a r g e t P o i n t < b r / > vhp" ]
B - - S+T - - > B 1 & B 2 & B 3 & B 4 & B 5
B 1 - - S+T - - > B 1 1 & B 1 2 & B 1 3
B 2 - - S+T - - > B 2 1 & B 2 2 & B 2 3
B 3 - - S+T - - > B 3 1 & B 3 2 & B 3 3
B 4 - - S+T - - > B 4 1 & B 4 2
B 5 - - S+T - - > B 5 1 & B 5 2
e n d
s u b g r a p h " W@xeB\ I n f r a s t r u c t u r e "
C [ " d e v i c e - s e r v i c e - i n f r a s t r u c t u r e " ]
C 1 [ " g a t e w a y / i m p l < b r / > QsQ[s" ]
C 1 1 [ " D e v i c e G a t e w a y I m p l " ]
C 1 2 [ " M q t t G a t e w a y I m p l " ]
C 2 [ " m q t t < b r / > M Q T T moYt" ]
C 2 1 [ " D e v i c e M e s s a g e H a n d l e r < b r / > YmoYthV" ]
C 2 2 [ " A p p M e s s a g e H a n d l e r < b r / > ^(umoYthV" ]
C 2 3 [ " M p s M e s s a g e H a n d l e r < b r / > \ z^moYthV" ]
C 2 4 [ " O p c M e s s a g e H a n d l e r < b r / > Џ~moYthV" ]
C 2 5 [ " M q t t H a n d l e r I m p l < b r / > ~ Nmo1u" ]
C 3 [ " c o n f i g < b r / > Mn{t" ]
C 3 1 [ " M q t t C o n f i g < b r / > M Q T T Mn" ]
C 3 2 [ " R e d i s C o n f i g < b r / > R e d i s Mn" ]
C 4 [ " m a p p e r < b r / > penc f\" ]
C 5 [ " s e r v i c e < b r / > W@x
gR" ]
C - - S+T - - > C 1 & C 2 & C 3 & C 4 & C 5
C 1 - - S+T - - > C 1 1 & C 1 2
C 2 - - S+T - - > C 2 1 & C 2 2 & C 2 3 & C 2 4 & C 2 5
C 3 - - S+T - - > C 3 1 & C 3 2
e n d
s u b g r a p h " (uB\ C o m m o n "
D [ " d e v i c e - s e r v i c e - c o m m o n " ]
D 1 [ " c o n s t a n t < b r / > 8^ϑ[IN" ]
D 1 1 [ " M q t t T o p i c s < b r / > M Q T T ;N" ]
D 1 2 [ " D e v i c e E r r o r C o d e < b r / > Yx" ]
D 2 [ " d t o < b r / > penc O[a" ]
D 2 1 [ " D e v i c e D T O < b r / > YD T O " ]
D 2 2 [ " E v e n t D T O < b r / > NND T O " ]
D 3 [ " u t i l < b r / > ]wQ{|" ]
D 3 1 [ " P o i n t C l o u d U t i l < b r / > pN]wQ" ]
D 3 2 [ " J s o n U t i l < b r / > J S O N ]wQ" ]
D 4 [ " e n u m s < b r / > g>N" ]
D 4 1 [ " M o d e l T y p e < b r / > !jW{|W" ]
D 4 2 [ " P o s e T y p e < b r / > Y{|W" ]
D 5 [ " a n n o t a t i o n < b r / > l" ]
D 5 1 [ " M q t t S u b s c r i b e r < b r / > M Q T T l" ]
D - - S+T - - > D 1 & D 2 & D 3 & D 4 & D 5
D 1 - - S+T - - > D 1 1 & D 1 2
D 2 - - S+T - - > D 2 1 & D 2 2
D 3 - - S+T - - > D 3 1 & D 3 2
D 4 - - S+T - - > D 4 1 & D 4 2
D 5 - - S+T - - > D 5 1
e n d
s u b g r a p h " [7bz/TRhV C l i e n t "
E [ " d e v i c e - s e r v i c e - c l i e n t - s t a r t e r " ]
E 1 [ " f e i g n < b r / > F e i g n [7bz" ]
E 1 1 [ " T o k e n F a c a d e F e i g n < b r / > NLr
gR[7bz" ]
E 1 2 [ " L o g L o g i n F a c a d e F e i g n < b r / > {vU_e_[7bz" ]
e n d
s u b g r a p h " P y t h o n S
gR"
P [ " d a s " ]
P 1 [ " m q t t _ r e c v . p y < b r / > moc6eYt" ]
P 2 [ " m q t t _ s e n d . p y < b r / > moSYt" ]
P 3 [ " d e v _ m n g . p y < b r / > Y{t" ]
P 4 [ " m y d e f . p y < b r / > 8h_[INT]wQ" ]
P - - S+T - - > P 1 & P 2 & P 3 & P 4
e n d
% % !jWWOVsQ|
A - - > B & D
C - - > B & D
B - - > D
E - - > D
% % cSN[ssQ|
C 1 1 - - . [s . - > B 3 2
C 1 2 - - . [s . - > B 3 3
A 2 1 - - . [s . - > B 3 1
% % NR(uAm
C 2 - - . (u . - > A 2
A 2 - - . (u . - > B 2
A 2 - - . (u . - > B 3
% % P y t h o n NJ a v a R f\
P 1 - - . R f\ . - > C 2
P 2 - - . R f\ . - > C 1 2
P 3 - - . R f\ . - > C 1 1
P 4 - - . R f\ . - > D 3
# # # 8h_~N
# # # # 1 . WB\8h_~N
- * * Y[SO ( D e v i c e ) * * : WB\v8h_[SO \ňNYv@b g^\'TL:N SbYr0MOnOo0SpeMnI{0
- * * pNYt
gR ( P o i n t C l o u d P r o c e s s S e r v i c e ) * * : #YtY
NbvpNpenc [svhhKm0YƋ+RI{8h_{l0
- * * W
gR/ zS* * : D e v i c e E v e n t P o r t [INNYNNYtv8h_NR;cS nxONR;v~|'0
- * * QsQcS* * : D e v i c e G a t e w a y N M q t t G a t e w a y [INNNY|~Ypenc^0M Q T T B r o k e r NNvbacS0
# # # # 2 . M Q T T moYtgg
- * * mo1u ( M q t t H a n d l e r I m p l ) * * : ~ NvM Q T T moeQS 9hnc;N\moRS~[^vYthV0
- * * N(umoYthV* * :
- D e v i c e M e s s a g e H a n d l e r : YtY
NLmoYOo
Nb0_0rI{
- A p p M e s s a g e H a n d l e r : Yt^(u NLmoY~[0SpenI{
- M p s M e s s a g e H a n d l e r : Yt\ z^
gRmo
- O p c M e s s a g e H a n d l e r : YtЏ~[7bzmo
- * * S p r i n g I n t e g r a t i o n Ɩb* * : Ǐ M q t t C o n f i g Mn[sNM Q T T B r o k e r vޏcTmo0
# # # # 3 . pNpencYtAm z
1 . * * pencc6e* * : YǏM Q T T
NbpNpenc0R / d e v / { d e v i c e I d } / c l o u d p o i n t ;N
2 . * * penc㉐g* * : D e v i c e M e s s a g e H a n d l e r ㉐gmov^cSpNPWhOo
3 . * * vhhKm* * : P o i n t C l o u d P r o c e s s S e r v i c e . g e t T r a c k e r T a r g e t s ( ) {vhMOn
4 . * * YƋ+R* * : WNpNؚ^R^Tzzyr_Ƌ+RNXTY
5 . * * NNYt* * : hKm̍PI{_8^NNv^SJTf
# # # !jWWOVsQ|
u_D D D vOVSR !jWWvOVsQ|npffnx
- * * ^(uB* * OVWB\T(uB\ #OSNRAm z
- * * W@xeB* * OVWB\T(uB\ cOb/g[s
- * * WB* * NOV(uB\ OcNR;v~|'
- * * [7bz/TRhV* * OV(uB\ cO[Y
gRcS
ُyUSTOVsQ|ONW!jWvrz' OvQ
NSb/g[s~valg0
# # # M Q T T moYtAm z
1 . * * moc6e* * : W@xeB\v M q t t C o n f i g MnNS p r i n g I n t e g r a t i o n v M q t t P a h o M e s s a g e D r i v e n C h a n n e l A d a p t e r #M Q T T ;Nv^\moc0Rc[v M e s s a g e C h a n n e l 0
2 . * * mo1u* * : M q t t H a n d l e r I m p l \O:N~ NveQS 9hncmo;N!j_9SM\vQRS~[^v M e s s a g e H a n d l e r 0
3 . * * NRYt* * : T*N M e s s a g e H a n d l e r (u^(uB\v
gRY D e v i c e E v e n t S e r v i c e eggbLwQSOvNR;0
4 . * * WgbL* * : ^(uB\
gRYXbW[aTW
gR[b8h_NR v^ǏQsQcSNY|~NN0
ُ*NAm z[sNb/gsQlpM Q T T O NNRsQlpYNNYt v[hQRy0
# # yv~gf
h f l n - d e v i c e - s e r v i c e /
% % % d e v i c e - s e r v i c e - a p p l i c a t i o n / # ^(uB\
% % % % c o n t r o l l e r / # W e b c6RhV
% % % % % w e b / # W e b zc6RhV
% % % % % w a p / # yRzc6RhV
% % % % s e r v i c e / # ^(u
gR
% % % % % i m p l / #
gR[s
% % % % c o n v e r t / # penclbchV
% % % % d t o / # penc O[a
% % % % t a s k / # [eNR
% % % d e v i c e - s e r v i c e - d o m a i n / # WB\
% % % % e n t i t y / # W[SO
% % % % s e r v i c e / # W
gR
% % % % % i m p l / #
gR[s
% % % % p o r t / # zScS
% % % % g a t e w a y / # QsQcS
% % % % e v e n t / # WNN
% % % % v o / # N{|W
% % % % a n n o t a t i o n / # ꁚ[INl
% % % % r e q u e s t / # Bl[a
% % % % v o / # <P[a
% % % d e v i c e - s e r v i c e - c l i e n t - s t a r t e r / # [7bz/TRhV
% % % % a p i / f e i g n / # F e i g n [7bz
% % % d e v i c e - s e r v i c e - s e r v e r / #
gR/TR!jWW
% % % % c o n f i g / # /TRMn
% % % % c o n t r o l l e r / # vcc6RhV
% % % % D e v i c e A p p l i c a t i o n . j a v a # ;N/TR{|
% % % d a s / # P y t h o n S
gR
% % % % m q t t _ r e c v . p y # moc6eYt
% % % % m q t t _ s e n d . p y # moSYt
% % % % d e v _ m n g . p y # Y{t
% % % % m y d e f . p y # 8h_[IN
% % % . g i t i g n o r e # G i t euMn
% % % D o c k e r f i l e # D o c k e r g^eN
% % % J e n k i n s f i l e # J e n k i n s C I / C D Am4l~
% % % p o m . x m l # M a v e n yv9hMn
% % % R E A D M E . m d # yvfech
# # 8h_Ryr'
# # # 1 . YceQ{t
- /ecYy{|WYv~ NceQ
- YlQ0Tr{t
- YSpeMnT zc6R
# # # 2 . pNpencYt
- [epNpencc6eT㉐g
- vhhKmTߍ*{l
- WNn u m p y {lI{NvJ a v a [s
# # # 3 . YƋ+R
- WNpNpencvNXTYƋ+R
- /eczz0PW N0 N0̍PI{YyY
- [eYrvcTSSU
# # # 4 . ̍PhKmJTf
- [e̍PNNhKm
- JTfRMnT{t
- Y nSJTfwM Q T T 0wOI{
# # # 5 . YzcS/ec
- W e b z{tLubcS
- yRzW A P cS
- \ z^
gRcS
- Џ~[7bzcS
# # M Q T T OOS
# # # M Q T T Mn
M Q T T
gRvޏcMnOoMON d e v i c e - s e r v i c e - s e r v e r !jWWv a p p l i c a t i o n . y m l eN-N
y a m l
m q t t :
s e r v e r :
u r i : t c p : / / 8 . 1 3 0 . 2 8 . 2 1 : 1 8 8 3
c l i e n t :
i d : d e v i c e - s e r v i c e -
u s e r n a m e : a d m i n
p a s s w o r d : p u b l i c
c o n n e c t :
t i m e o u t : 3 0
k e e p :
a l i v e :
i n t e r v a l : 6 0
c l e a n :
s e s s i o n : t r u e
# # # M Q T T ;Nĉ
yvǑ(uB\!kSvM Q T T ;N
# # # # Y
NL;N ( D e v i c e ! S e r v e r )
- * * YOo
Nb* * : / d e v / { d e v i c e I d } / r e p o r t _ d e v i c e _ i n f o
- * * Y_* * : / d e v / { d e v i c e I d } / k e e p a l i v e
- * * Yr
Nb* * : / d e v / { d e v i c e I d } / r e p o r t _ s t a t u s
- * * YSpe
Nb* * : / d e v / { d e v i c e I d } / r e p o r t _ p a r a m
- * * pNpenc
Nb* * : / d e v / { d e v i c e I d } / c l o u d p o i n t
- * * ̍PNN
Nb* * : / d e v / { d e v i c e I d } / r e p o r t _ f a l l
- * * [epenc
Nb* * : / d e v / { d e v i c e I d } / d s p _ d a t a
# # # # ^(u NL;N ( S e r v e r ! D e v i c e )
- * * D A S
gRmo* * : / d a s / { m e s s a g e T y p e }
- * * \ z^
gRmo* * : / m p s / { m e s s a g e T y p e }
- * * Џ~[7bzmo* * : / o p c / { m e s s a g e T y p e }
# # # # wQSOmo;N
- * * YrSf* * : / d a s / d e v _ s t a t u s
- * * [eMOnY* * : / d a s / r e a l t i m e _ p o s
- * * ̍PNNw* * : / d a s / e v e n t
- * * JTfNN* * : / d a s / a l a r m _ e v e n t
- * * Y~[* * : / m p s / b i n d _ d e v i c e
- * * Y~* * : / m p s / u n b i n d _ d e v i c e
- * * Spen* * : / m p s / s e t _ d e v i c e _ p a r a m
# # # mo<h_ĉ
# # # # pNpencmo<h_
j s o n
{
" d e v i c e _ i d " : " YI D " ,
" t i m e s t a m p " : 1 2 3 4 5 6 7 8 9 0 0 0 0 ,
" c l o u d _ p o i n t s " : [
[ x 1 , y 1 , z 1 ] ,
[ x 2 , y 2 , z 2 ] ,
. . .
] ,
" t r a c k e r t a r g e t s " : [
[ x , y , z ]
]
}
# # # # ̍PNNmo<h
j s o n
{
" d e v i c e _ i d " : " YI D " ,
" t i m e s t a m p " : 1 2 3 4 5 6 7 8 9 0 0 0 0 ,
" e v e n t _ t y p e " : " f a l l _ d e t e c t e d " ,
" t a r g e t _ p o s i t i o n " : [ x , y , z ] ,
" c o n f i d e n c e " : 0 . 9 5
}
# # _STKmՋ
# # # _SsXBl
- J a v a 8 +
- M a v e n 3 . 6 +
- S p r i n g B o o t 2 . x
- R e d i s ( (uNX[)
- M y S Q L ( (uNpenccENS)
- M Q T T B r o k e r ( E c l i p s e M o s q u i t t o cP)
# # # ЏLKmՋ
b a s h
# ЏL@b gKmՋ
m v n t e s t
# ЏLc[vKmՋ{|
m v n t e s t - D t e s t = " c o m . h f l n . d e v i c e . i n f r a s t r u c t u r e . c o n f i g . M q t t C o n f i g T e s t "
# ЏLM Q T T ƖbKmՋ
m v n t e s t - D t e s t = " c o m . h f l n . d e v i c e . i n f r a s t r u c t u r e . m q t t . * T e s t "
# # # Nx(ϑhg
b a s h
# ыhg
m v n c l e a n c o m p i l e
# OVRg
m v n d e p e n d e n c y : a n a l y z e
# Nxvs
m v n j a c o c o : r e p o r t
# # rcWS
# # # ,g0W _Sr
b a s h
# ыSbS
m v n c l e a n p a c k a g e
# ЏL
gR
j a v a - j a r d e v i c e - s e r v i c e - s e r v e r / t a r g e t / d e v i c e - s e r v i c e - s e r v e r - 1 . 0 . 0 - S N A P S H O T . j a r
# # # D o c k e r r
b a s h
# g^\P
d o c k e r b u i l d - t d e v i c e - s e r v i c e : l a t e s t .
# ЏL[hV
d o c k e r r u n - d - p 8 0 8 0 : 8 0 8 0 - - n a m e d e v i c e - s e r v i c e d e v i c e - s e r v i c e : l a t e s t
# # # uNsXr
1 . * * sXMn* * : O9e a p p l i c a t i o n - p r o d . y m l MneN
2 . * * penc^ RYS* * : gbL s r c / m a i n / r e s o u r c e s / d b / m i g r a t i o n / NvS Q L ,g
3 . * *
gR/TR* * : O(u s y s t e m d b s u p e r v i s o r {t
gRۏ z
4 . * * vcMn* * : Mn P r o m e t h e u s + G r a f a n a vcJTf
# # 'OS
# # # pNpencYtOS
- Ǒ(uAm_YtQ\QX[S(u
- O(u[alb/g
Y(u4Ne[a
- _ekYt^sQ._;
# # # M Q T T moYtOS
- moYthVv^LSYt
- WN;Nvmo1uOS
- ޏclTO{t
# # # penc^OS
- O(uM y B a t i s P l u s cGS _SHes
- TtO(uX[V{eu
- penc^ޏclO
# # vcTЏ~
# # # ^(uvc
- S p r i n g B o o t A c t u a t o r eP^hg
- ꁚ[INNRch6eƖ
- J V M 'vc
# # # e_{t
- ~gSe_Q
- R~+Re_Mn
- e_nlTR_chV{eu
# # # JTfMn
-
gRS(u'JTf
- NR8^JTf
- 'chJTf
- - -
# # !.scWS
# # # Nxĉ
- u_?̑]]J a v a _SKbQ
- O(u~ NvNx<h_SMn
- Q[tevUSCQKmՋ
# # # cNĉ
- O(uINScNOo
- R/e}T
Tĉ f e a t u r e / R
Ty 0 b u g f i x / c
- P u l l R e q u e s t {ǏNx[g
# # # ech~b
- SefeA P I ech
- ~bggech
- U͑Sfe
Y gb^ cNI s s u e bT| _SV 0