git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index 1711918ffdaa616b1674e5922059fe18d9129349..72cb21d4ff47dddaee1da492145487cc8b31a8ae 100644 (file)
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -11,6 +11,20 @@
       ]\r
        },\r
        {\r
+      "active": false,\r
+         "name" : "TRAFFIC anyagok visszatöltése",\r
+      "template": "retrieve-traffic-missing-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "parameters": [ \r
+       {"name": "dbUrl", "value": "", "type": "java.lang.String"},\r
+       {"name": "userName", "value": "MAM", "type": "java.lang.String"},\r
+       {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"},\r
+       {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"},\r
+       {"name": "outputPath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT", "type": "java.lang.String"}\r
+      ]\r
+       },      \r
+       {\r
       "active": false,\r
          "name" : "Anyagok törlése",\r
       "template": "delete-materials.xml",\r
@@ -23,13 +37,6 @@
       ]\r
        },      \r
        {\r
-      "active": false,\r
-         "name" : "TRAFFIC anyagok visszatöltése",\r
-      "template": "retrieve-traffic-missing-materials.xml",\r
-      "executeimmediate": true,\r
-      "cronexpression": "0 0 0/1 1/1 * ? *"\r
-       },      \r
-       {\r
       "active": false,\r
          "name" : "NEXIO anyagok törlése",\r
       "template": "delete-nexio-materials.xml",\r

diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-material.xml b/server/user.jobengine.executors/jobtemplates/retrieve-material.xml
index b236b5011e826e3aff7c2ccf0b16813e25d162fe..cae277b0281c0bece90c98d9e7a88042cab723c4 100644 (file)
--- a/server/user.jobengine.executors/jobtemplates/retrieve-material.xml
+++ b/server/user.jobengine.executors/jobtemplates/retrieve-material.xml
@@ -3,6 +3,7 @@
        <declarations>\r
                <variables>\r
                        <variable name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
+                       <variable name="outputPath" type="java.lang.String" />\r
                </variables>\r
        </declarations>\r
        <commands>\r
@@ -11,6 +12,9 @@
                                <input>\r
                                        <parameter name="mediaCubeMedia" />\r
                                </input>\r
+                               <input>\r
+                                       <parameter name="outputPath" />\r
+                               </input>\r
                        </inputs>\r
                </calljobstep>\r
        </commands>\r

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 0231ada984dab8a5cebc1d0c4f493e35b1480511..20a078694485694151796fa69a5138c3e4ccd08a 100644 (file)
--- a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml
+++ b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <jobtemplate name="TRAFFIC anyagok visszatöltése">\r
+       <declarations>\r
+               <variables>\r
+                       <variable name="dbUrl" type="java.lang.String" />\r
+                       <variable name="userName" type="java.lang.String" />\r
+                       <variable name="password" type="java.lang.String" />\r
+                       <variable name="lookupDays" type="java.lang.Integer" />\r
+                       <variable name="outputPath" type="java.lang.String" />\r
+               </variables>\r
+       </declarations>\r
        <commands>\r
-               <calljobstep id="id1" type="user.jobengine.server.steps.CheckTrafficMissingMaterialsStep" weight="1" />\r
+               <calljobstep id="id1" type="user.jobengine.server.steps.CheckTrafficMissingMaterialsStep" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="outputPath" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
        </commands>\r
 </jobtemplate>
\ No newline at end of file

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 10c5bcbf0fba22ae6be15ee5befff69968911c5d..be290760d2773ea80fd84386485cd9c49f58f480 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
@@ -20,30 +20,24 @@ import user.jobengine.server.IJobRuntime;
 \r
 public class CheckTrafficMissingMaterialsStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
+       private static final String OUTPUT_PATH = "outputPath";\r
        private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia";\r
        private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
-       private static final String TRAFFIC_DB_PASSWORD = "traffic.db.password";\r
-       private static final String TRAFFIC_DB_USER = "traffic.db.user";\r
-       private static final String TRAFFIC_DB_URL = "traffic.db.url";\r
        private static final String SQL = "{call clIFsp_EC_MAM(1001, 40, Null,  Null, ?)}";\r
-       private static final String JOBTEMPLATE = null;\r
-       private IItemManager manager;\r
-       private IJobEngine jobEngine;\r
+       private static final String JOBTEMPLATE = "retrieve-material.xml";\r
 \r
        @StepEntry\r
-       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               this.jobEngine = jobEngine;\r
-               manager = jobEngine.getItemManager();\r
-               try (Connection con = getSQLConnection(); PreparedStatement stmt = con.prepareStatement(SQL, ResultSet.TYPE_SCROLL_SENSITIVE)) {\r
-                       stmt.setInt(1, 7);\r
+       public Object[] execute(String dbUrl, String userName, String password, int lookupDays, String outputPath, IJobEngine jobEngine, IJobRuntime jobRuntime)\r
+                       throws Exception {\r
+\r
+               try (Connection con = getConnection(dbUrl, userName, password); PreparedStatement stmt = con.prepareStatement(SQL)) {\r
+                       stmt.setInt(1, lookupDays);\r
                        try (ResultSet rs = stmt.executeQuery()) {\r
-                               rs.last();\r
-                               int count = rs.getRow();\r
                                while (rs.next()) {\r
                                        String trafficId = rs.getString(5);\r
                                        if (StringUtils.isNotBlank(trafficId)) {\r
                                                try {\r
-                                                       processTrafficId(trafficId);\r
+                                                       processTrafficId(trafficId, outputPath, jobEngine);\r
                                                } catch (Exception e) {\r
                                                        logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage());\r
                                                }\r
@@ -59,17 +53,20 @@ public class CheckTrafficMissingMaterialsStep extends JobStep {
                return null;\r
        }\r
 \r
-       private Connection getSQLConnection() throws Exception {\r
+       private Connection getConnection(String dbUrl, String userName, String password) throws Exception {\r
                Connection result = null;\r
-               Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
-               String url = System.getProperty(TRAFFIC_DB_URL);\r
-               String user = System.getProperty(TRAFFIC_DB_USER);\r
-               String pass = System.getProperty(TRAFFIC_DB_PASSWORD);\r
-               result = DriverManager.getConnection(url, user, pass);\r
+               try {\r
+                       Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
+                       result = DriverManager.getConnection(dbUrl, userName, password);\r
+               } catch (Exception e) {\r
+                       logger.error(getMarker(), "Hiba lépett fel a folyamat indításakor. A rendszer hibaüzenete: {}", e.getMessage());\r
+                       throw e;\r
+               }\r
                return result;\r
        }\r
 \r
-       private void processTrafficId(String trafficId) throws Exception {\r
+       private void processTrafficId(String trafficId, String outputPath, IJobEngine jobEngine) throws Exception {\r
+               IItemManager manager = jobEngine.getItemManager();\r
                MediaFileDAO dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);\r
                List<IEntityBase> medias = dao.getByHouseId(trafficId);\r
                if (medias == null || medias.size() == 0) {\r
@@ -82,8 +79,8 @@ public class CheckTrafficMissingMaterialsStep extends JobStep {
                        return;\r
                }\r
 \r
-               String title = "Visszatöltés: " + trafficId;\r
-               jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0)));\r
+               String title = "Traffic adásanyag visszatöltés: " + trafficId;\r
+               jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, outputPath));\r
        }\r
 \r
 }\r