bfg-common 1.4.301 → 1.4.303

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -133,72 +133,48 @@ watch(
   },
   { deep: true }
 )
-/* TODO рефакторинг все методы надо рефакторить */
-const generateOnceCronExpression = (date: Date): any => {
-  if (!date) return
-
-  const minutes = date.getMinutes()
-  const hours = date.getHours()
-  const day = date.getDate()
-  const month = date.getMonth() + 1 // В cron месяцы начинаются с 1 (январь = 1)
-  const dayOfWeek = '*' // Для одноразовой задачи день недели неважен
 
-  // Генерируем cron-выражение
-  return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
-}
+/* TODO рефакторинг все методы надо рефакторить */
 const generateHourlyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
-  if (!date) return
-
-  const startOnTimestamp = Math.floor(
+  const startTimestamp = Math.floor(
     new Date(data.frg_start_on_time).getTime() / 1000
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  // const minutes = date.getMinutes()
-  // const hours = date.getHours()
-
   // Генерируем cron-выражение
-  // return `${minutes} ${hours}/${delay} * * *`
   return endTimestamp
-    ? `0 */${data.frg_interval} * * * start=${startOnTimestamp},end=${endTimestamp}`
-    : `0 */${data.frg_interval} * * * start=${startOnTimestamp}`
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:${data.frg_interval}-0-0-0`
+    : `* * * * * ${startTimestamp}:${data.frg_interval}-0-0-0`
 }
-const generateDaylyCronExpression = (
+const generateDailyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
-  if (!date) return
-
-  const startOnTimestamp = Math.floor(
+  const startTimestamp = Math.floor(
     new Date(data.frg_start_on_time).getTime() / 1000
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
   // Генерируем cron-выражение
   return endTimestamp
-    ? `0 0 */${data.frg_interval} * * start=${startOnTimestamp},end=${endTimestamp}`
-    : `0 0 */${data.frg_interval} * * start=${startOnTimestamp}`
-
-  // return `${minutes} ${hours} ${day}/${delay} * *`
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:0-${data.frg_interval}-0-0`
+    : `* * * * * ${startTimestamp}:0-${data.frg_interval}-0-0`
 }
 const generateWeeklyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
   const { frg_on_week_days } = data
 
-  const startOnTimestamp = Math.floor(
+  const startTimestamp = Math.floor(
     new Date(data.frg_start_on_time).getTime() / 1000
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+  const daysOfWeek = frg_on_week_days.join(',')
 
   return endTimestamp
-    ? `* * * * ${frg_on_week_days.join(',')}/${
-        data.frg_interval
-      } start=${startOnTimestamp},end=${endTimestamp}`
-    : `* * * * ${frg_on_week_days.join(',')}/${
-        data.frg_interval
-      } start=${startOnTimestamp}`
+    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
+    : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
 }
 
 const generateMonthlyCronExpression = (
@@ -207,19 +183,21 @@ const generateMonthlyCronExpression = (
   const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
     data
 
-  const startOnTimestamp = Math.floor(
+  const startTimestamp = Math.floor(
     new Date(data.frg_start_on_time).getTime() / 1000
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  const month = data.frg_monthly_mode === 'week' ? '*' : frg_monthly_day
-  const cronWeekly = `${frq_week_day}#${frq_ordinal_number}`
-  const dayOfWeek = data.frg_monthly_mode === 'week' ? cronWeekly : '*'
+  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
+
+  const timestamp = endTimestamp
+    ? `${startTimestamp}-${endTimestamp}`
+    : startTimestamp
 
   // Генерируем cron-выражение
-  return endTimestamp
-    ? `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp},end=${endTimestamp}`
-    : `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp}`
+  return data.frg_monthly_mode === 'week'
+    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
+    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
 }
 
 const generateCronExpression = (
@@ -231,9 +209,10 @@ const generateCronExpression = (
   // Генерируем cron-выражение на основе runType
   switch (runType) {
     case 'once':
-      cronExpression = generateOnceCronExpression(
-        new Date(interval.frg_on_time)
+      const timestamp = Math.floor(
+        new Date(interval.frg_on_time).getTime() / 1000
       )
+      cronExpression = `* * * * * ${timestamp}:0-0-0-0:once`
       break
     case 'after-startup':
       const suffixDelay =
@@ -244,7 +223,7 @@ const generateCronExpression = (
       cronExpression = generateHourlyCronExpression(interval)
       break
     case 'day':
-      cronExpression = generateDaylyCronExpression(interval)
+      cronExpression = generateDailyCronExpression(interval)
       break
     case 'week':
       cronExpression = generateWeeklyCronExpression(interval)

package/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask.ts

@@ -17,7 +17,7 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
     frg_monthly_day: 0,
     frq_week_day: '',
     frq_ordinal_number: '',
-    frg_on_time: null,
+    frg_on_time: '',
     frg_on_week_days: [],
   }
 }

package/components/common/pages/scheduledTasks/modals/lib/models/interfaces.ts

@@ -15,7 +15,7 @@ export interface UI_I_ScheduleNewTasksForm {
   frg_monthly_day: number
   frq_ordinal_number: string
   frq_week_day: UI_T_FrequencyWeeksDays
-  frg_on_time: number | null
+  frg_on_time: string
   frg_on_week_days: number[]
   cron: string
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.301",
+  "version": "1.4.303",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",