1818import com .xxl .job .core .glue .GlueTypeEnum ;
1919import com .xxl .sso .core .model .LoginInfo ;
2020import com .xxl .tool .core .DateTool ;
21+ import com .xxl .tool .core .StringTool ;
22+ import com .xxl .tool .gson .GsonTool ;
2123import com .xxl .tool .response .PageModel ;
2224import com .xxl .tool .response .Response ;
2325import jakarta .annotation .Resource ;
@@ -70,10 +72,10 @@ public Response<String> add(XxlJobInfo jobInfo, LoginInfo loginInfo) {
7072 if (group == null ) {
7173 return Response .ofFail (I18nUtil .getString ("system_please_choose" )+I18nUtil .getString ("jobinfo_field_jobgroup" ));
7274 }
73- if (jobInfo . getJobDesc ()== null || jobInfo .getJobDesc (). trim (). length ()== 0 ) {
75+ if (StringTool . isBlank ( jobInfo .getJobDesc ()) ) {
7476 return Response .ofFail ( (I18nUtil .getString ("system_please_input" )+I18nUtil .getString ("jobinfo_field_jobdesc" )) );
7577 }
76- if (jobInfo . getAuthor ()== null || jobInfo .getAuthor (). trim (). length ()== 0 ) {
78+ if (StringTool . isBlank ( jobInfo .getAuthor ()) ) {
7779 return Response .ofFail ( (I18nUtil .getString ("system_please_input" )+I18nUtil .getString ("jobinfo_field_author" )) );
7880 }
7981
@@ -91,7 +93,7 @@ public Response<String> add(XxlJobInfo jobInfo, LoginInfo loginInfo) {
9193 return Response .ofFail ( (I18nUtil .getString ("schedule_type" )) );
9294 }
9395 try {
94- int fixSecond = Integer .valueOf (jobInfo .getScheduleConf ());
96+ int fixSecond = Integer .parseInt (jobInfo .getScheduleConf ());
9597 if (fixSecond < 1 ) {
9698 return Response .ofFail ( (I18nUtil .getString ("schedule_type" )+I18nUtil .getString ("system_unvalid" )) );
9799 }
@@ -104,7 +106,7 @@ public Response<String> add(XxlJobInfo jobInfo, LoginInfo loginInfo) {
104106 if (GlueTypeEnum .match (jobInfo .getGlueType ()) == null ) {
105107 return Response .ofFail ( (I18nUtil .getString ("jobinfo_field_gluetype" )+I18nUtil .getString ("system_unvalid" )) );
106108 }
107- if (GlueTypeEnum .BEAN ==GlueTypeEnum .match (jobInfo .getGlueType ()) && ( jobInfo . getExecutorHandler ()== null || jobInfo .getExecutorHandler (). trim (). length ()== 0 ) ) {
109+ if (GlueTypeEnum .BEAN ==GlueTypeEnum .match (jobInfo .getGlueType ()) && StringTool . isBlank ( jobInfo .getExecutorHandler ()) ) {
108110 return Response .ofFail ( (I18nUtil .getString ("system_please_input" )+"JobHandler" ) );
109111 }
110112 // 》fix "\r" in shell
@@ -124,10 +126,10 @@ public Response<String> add(XxlJobInfo jobInfo, LoginInfo loginInfo) {
124126 }
125127
126128 // 》ChildJobId valid
127- if (jobInfo . getChildJobId ()!= null && jobInfo .getChildJobId (). trim (). length ()> 0 ) {
129+ if (StringTool . isNotBlank ( jobInfo .getChildJobId ()) ) {
128130 String [] childJobIds = jobInfo .getChildJobId ().split ("," );
129131 for (String childJobIdItem : childJobIds ) {
130- if (childJobIdItem != null && childJobIdItem . trim (). length ()> 0 && isNumeric (childJobIdItem )) {
132+ if (StringTool . isNotBlank ( childJobIdItem ) && StringTool . isNumeric (childJobIdItem )) {
131133 XxlJobInfo childJobInfo = xxlJobInfoMapper .loadById (Integer .parseInt (childJobIdItem ));
132134 if (childJobInfo ==null ) {
133135 return Response .ofFail (
@@ -165,26 +167,21 @@ public Response<String> add(XxlJobInfo jobInfo, LoginInfo loginInfo) {
165167 return Response .ofFail ( (I18nUtil .getString ("jobinfo_field_add" )+I18nUtil .getString ("system_fail" )) );
166168 }
167169
168- return Response .ofSuccess (String .valueOf (jobInfo .getId ()));
169- }
170+ // write operation log
171+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
172+ loginInfo .getUserName (), "jobinfo-save" , GsonTool .toJson (jobInfo ));
170173
171- private boolean isNumeric (String str ){
172- try {
173- int result = Integer .valueOf (str );
174- return true ;
175- } catch (NumberFormatException e ) {
176- return false ;
177- }
174+ return Response .ofSuccess (String .valueOf (jobInfo .getId ()));
178175 }
179176
180177 @ Override
181178 public Response <String > update (XxlJobInfo jobInfo , LoginInfo loginInfo ) {
182179
183180 // valid base
184- if (jobInfo . getJobDesc ()== null || jobInfo .getJobDesc (). trim (). length ()== 0 ) {
181+ if (StringTool . isBlank ( jobInfo .getJobDesc ()) ) {
185182 return Response .ofFail ( (I18nUtil .getString ("system_please_input" )+I18nUtil .getString ("jobinfo_field_jobdesc" )) );
186183 }
187- if (jobInfo . getAuthor ()== null || jobInfo .getAuthor (). trim (). length ()== 0 ) {
184+ if (StringTool . isBlank ( jobInfo .getAuthor ()) ) {
188185 return Response .ofFail ( (I18nUtil .getString ("system_please_input" )+I18nUtil .getString ("jobinfo_field_author" )) );
189186 }
190187
@@ -202,7 +199,7 @@ public Response<String> update(XxlJobInfo jobInfo, LoginInfo loginInfo) {
202199 return Response .ofFail ( (I18nUtil .getString ("schedule_type" )+I18nUtil .getString ("system_unvalid" )) );
203200 }
204201 try {
205- int fixSecond = Integer .valueOf (jobInfo .getScheduleConf ());
202+ int fixSecond = Integer .parseInt (jobInfo .getScheduleConf ());
206203 if (fixSecond < 1 ) {
207204 return Response .ofFail ( (I18nUtil .getString ("schedule_type" )+I18nUtil .getString ("system_unvalid" )) );
208205 }
@@ -223,10 +220,10 @@ public Response<String> update(XxlJobInfo jobInfo, LoginInfo loginInfo) {
223220 }
224221
225222 // 》ChildJobId valid
226- if (jobInfo . getChildJobId ()!= null && jobInfo .getChildJobId (). trim (). length ()> 0 ) {
223+ if (StringTool . isNotBlank ( jobInfo .getChildJobId ()) ) {
227224 String [] childJobIds = jobInfo .getChildJobId ().split ("," );
228225 for (String childJobIdItem : childJobIds ) {
229- if (childJobIdItem != null && childJobIdItem . trim (). length ()> 0 && isNumeric (childJobIdItem )) {
226+ if (StringTool . isNotBlank ( childJobIdItem ) && StringTool . isNumeric (childJobIdItem )) {
230227 // parse child
231228 int childJobId = Integer .parseInt (childJobIdItem );
232229 if (childJobId == jobInfo .getId ()) {
@@ -310,6 +307,10 @@ public Response<String> update(XxlJobInfo jobInfo, LoginInfo loginInfo) {
310307 exists_jobInfo .setUpdateTime (new Date ());
311308 xxlJobInfoMapper .update (exists_jobInfo );
312309
310+ // write operation log
311+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
312+ loginInfo .getUserName (), "jobinfo-update" , GsonTool .toJson (exists_jobInfo ));
313+
313314 return Response .ofSuccess ();
314315 }
315316
@@ -329,6 +330,11 @@ public Response<String> remove(int id, LoginInfo loginInfo) {
329330 xxlJobInfoMapper .delete (id );
330331 xxlJobLogMapper .delete (id );
331332 xxlJobLogGlueMapper .deleteByJobId (id );
333+
334+ // write operation log
335+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
336+ loginInfo .getUserName (), "jobinfo-remove" , id );
337+
332338 return Response .ofSuccess ();
333339 }
334340
@@ -372,6 +378,11 @@ public Response<String> start(int id, LoginInfo loginInfo) {
372378
373379 xxlJobInfo .setUpdateTime (new Date ());
374380 xxlJobInfoMapper .update (xxlJobInfo );
381+
382+ // write operation log
383+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
384+ loginInfo .getUserName (), "jobinfo-start" , id );
385+
375386 return Response .ofSuccess ();
376387 }
377388
@@ -395,6 +406,11 @@ public Response<String> stop(int id, LoginInfo loginInfo) {
395406
396407 xxlJobInfo .setUpdateTime (new Date ());
397408 xxlJobInfoMapper .update (xxlJobInfo );
409+
410+ // write operation log
411+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
412+ loginInfo .getUserName (), "jobinfo-stop" , id );
413+
398414 return Response .ofSuccess ();
399415 }
400416
@@ -417,6 +433,11 @@ public Response<String> trigger(LoginInfo loginInfo, int jobId, String executorP
417433 }
418434
419435 XxlJobAdminBootstrap .getInstance ().getJobTriggerPoolHelper ().trigger (jobId , TriggerTypeEnum .MANUAL , -1 , null , executorParam , addressList );
436+
437+ // write operation log
438+ logger .info (">>>>>>>>>>> xxl-job operation log: operator = {}, type = {}, content = {}" ,
439+ loginInfo .getUserName (), "jobinfo-trigger" , jobId );
440+
420441 return Response .ofSuccess ();
421442 }
422443
0 commit comments