File tree Expand file tree Collapse file tree 3 files changed +17
-77
lines changed
dinky-admin/src/main/java/org/dinky Expand file tree Collapse file tree 3 files changed +17
-77
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1919
2020package org .dinky .ws .handler ;
2121
22+ import org .dinky .assertion .Asserts ;
2223import org .dinky .ws .GlobalWebSocketTopic ;
2324import org .dinky .ws .WsSendEvent ;
2425
@@ -50,11 +51,13 @@ public void run() {
5051 @ Override
5152 public void run () {
5253 Map <String , ?> data = autoMessageSend ();
53- WsSendEvent event = WsSendEvent .builder ()
54- .topic (topic )
55- .paramsAndData (data )
56- .build ();
57- applicationEventPublisher .publishEvent (event );
54+ if (Asserts .isNotNullMap (data )) {
55+ WsSendEvent event = WsSendEvent .builder ()
56+ .topic (topic )
57+ .paramsAndData (data )
58+ .build ();
59+ applicationEventPublisher .publishEvent (event );
60+ }
5861 }
5962 },
6063 0 ,
Original file line number Diff line number Diff line change 2525import java .util .HashMap ;
2626import java .util .Map ;
2727import java .util .Set ;
28+ import java .util .concurrent .ConcurrentSkipListSet ;
2829import java .util .concurrent .TimeUnit ;
2930
3031import org .springframework .stereotype .Service ;
3435@ Slf4j
3536@ Service
3637public class TaskRunInstance extends ScheduleMessageEventHandler {
37- // todo 这里需要优化下,应该触发hook调用
38+
39+ private Set <Integer > runningJobIds = new ConcurrentSkipListSet <>();
3840
3941 @ Override
4042 public Map <String , Object > firstSubscribe (Set <String > allParams ) {
@@ -51,11 +53,14 @@ public GlobalWebSocketTopic getTopic() {
5153 @ Override
5254 public Map <String , Object > autoMessageSend () {
5355 Set <Integer > currentMonitorTaskIds = FlinkJobThreadPool .getInstance ().getCurrentMonitorTaskIds ();
54- Map <String , Object > result = new HashMap <>();
55- if (!currentMonitorTaskIds .isEmpty ()) {
56+ if (!runningJobIds .equals (currentMonitorTaskIds )) {
57+ runningJobIds .clear ();
58+ runningJobIds .addAll (currentMonitorTaskIds );
59+ Map <String , Object > result = new HashMap <>();
5660 result .put ("RunningTaskId" , currentMonitorTaskIds );
61+ return result ;
5762 }
58- return result ;
63+ return new HashMap <>() ;
5964 }
6065
6166 @ Override
You can’t perform that action at this time.
0 commit comments