From: Vásáry Dániel Date: Mon, 2 Oct 2017 22:23:09 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=176210af5f78adc51454a7c74d0a473b927e6963;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30506 --- diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json index 2d0a4edb..1711918f 100644 --- a/server/-configuration/scheduledjobs.json +++ b/server/-configuration/scheduledjobs.json @@ -24,7 +24,7 @@ }, { "active": false, - "name" : "Traffic anyagok visszatöltése", + "name" : "TRAFFIC anyagok visszatöltése", "template": "retrieve-traffic-missing-materials.xml", "executeimmediate": true, "cronexpression": "0 0 0/1 1/1 * ? *" diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml index d311ad4b..0231ada9 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml @@ -1,5 +1,5 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java index 487de5ed..10c5bcbf 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java @@ -4,15 +4,15 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import user.commons.IEntityBase; +import user.commons.ListUtils; import user.jobengine.db.IItemManager; -import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.db.MediaFileDAO; import user.jobengine.server.IJobEngine; @@ -20,25 +20,30 @@ import user.jobengine.server.IJobRuntime; public class CheckTrafficMissingMaterialsStep extends JobStep { private static final Logger logger = LogManager.getLogger(); + private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia"; private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private static final String TRAFFIC_DB_PASSWORD = "traffic.db.password"; private static final String TRAFFIC_DB_USER = "traffic.db.user"; private static final String TRAFFIC_DB_URL = "traffic.db.url"; private static final String SQL = "{call clIFsp_EC_MAM(1001, 40, Null, Null, ?)}"; + private static final String JOBTEMPLATE = null; private IItemManager manager; + private IJobEngine jobEngine; @StepEntry public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { - List result = new ArrayList<>(); + this.jobEngine = jobEngine; manager = jobEngine.getItemManager(); - try (Connection con = getSQLConnection(); PreparedStatement stmt = con.prepareStatement(SQL)) { + try (Connection con = getSQLConnection(); PreparedStatement stmt = con.prepareStatement(SQL, ResultSet.TYPE_SCROLL_SENSITIVE)) { stmt.setInt(1, 7); try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { + rs.last(); + int count = rs.getRow(); + while (rs.next()) { String trafficId = rs.getString(5); if (StringUtils.isNotBlank(trafficId)) { try { - processTrafficId(result, trafficId); + processTrafficId(trafficId); } catch (Exception e) { logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage()); } @@ -51,7 +56,7 @@ public class CheckTrafficMissingMaterialsStep extends JobStep { throw e; } finally { } - return new Object[] {}; + return null; } private Connection getSQLConnection() throws Exception { @@ -64,10 +69,10 @@ public class CheckTrafficMissingMaterialsStep extends JobStep { return result; } - private void processTrafficId(List result, String trafficId) throws Exception { + private void processTrafficId(String trafficId) throws Exception { MediaFileDAO dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class); - List medias = dao.getByHouseId(trafficId); - if (medias.size() == 0) { + List medias = dao.getByHouseId(trafficId); + if (medias == null || medias.size() == 0) { logger.error(getMarker(), "Az {} anyag nem található az archívumban.", trafficId); return; } @@ -77,8 +82,8 @@ public class CheckTrafficMissingMaterialsStep extends JobStep { return; } - result.add(medias.get(0)); - + String title = "Visszatöltés: " + trafficId; + jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0))); } } diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj index 2a9e05da..da5b04f3 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj @@ -123,12 +123,12 @@ public class MediaFileDAO extends EntityBaseDAO { return iter; } - public List getByHouseId(String houseId) { + public List getByHouseId(String houseId) { manager.traceIn(); - List result = null; + List result = null; DefaultContext context = manager.getDbContext(); try { - MediaFileIter iter = selectByHouseId(context, houseId); + ResultSetIterImpl iter = selectByHouseId(context, houseId); result = getList(context, iter, false); } catch (Exception e) { throw new ItemManagerException(e);