From fb44df074121ea45182f6a8b6cbd32521202f294 Mon Sep 17 00:00:00 2001 From: Omar Sweidan Date: Wed, 1 Jun 2022 12:04:30 +0200 Subject: [PATCH] =?utf8?q?assembleSchedulesJson-ban=20=C3=BAj=20objektum?= =?utf8?q?=20=C3=B6ssze=C3=A1ll=C3=ADt=C3=A1sa?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../server/JobEngineConfiguration.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java index 29ab9bcd..eb1d5504 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java @@ -423,14 +423,22 @@ public class JobEngineConfiguration implements IJobEngineConfiguration { BasicDBObject dbo = new BasicDBObject(); BasicDBList jobList = new BasicDBList(); for (int i = 0; i < schedules.size(); i++) { - BasicDBObject temp = schedules.get(i).getValue(); - temp.remove("xml"); - temp.remove("nextTime"); - if (temp.get("active") == null) { - temp.remove("active"); + BasicDBObject temp= new BasicDBObject(); + if (schedules.get(i).getValue().get("name") != null) { + temp.append("name", schedules.get(i).getValue().get("name")); } - if (temp.get("executeimmediate") == null) { - temp.remove("executeimmediate"); + temp.append("template", schedules.get(i).getValue().get("template")); + if (schedules.get(i).getValue().get("active") != null) { + temp.append("active", schedules.get(i).getValue().get("active")); + } + if (schedules.get(i).getValue().get("executeimmediate") != null) { + temp.append("executeimmediate", schedules.get(i).getValue().get("executeimmediate")); + } + if (schedules.get(i).getValue().get("cronexpression") != null) { + temp.append("cronexpression", schedules.get(i).getValue().get("cronexpression")); + } + if (schedules.get(i).getValue().get("parameters") != null) { + temp.append("parameters", new BasicDBList(schedules.get(i).getValue().get("parameters"))); } jobList.add(temp); } -- 2.54.0