bfg-common 1.4.299 → 1.4.300

package/components/common/pages/scheduledTasks/modals/common/frequency/end/End.vue

@@ -62,6 +62,8 @@ watch(
   ([newValue1, newValue2]: [string, 'never' | 'on']) => {
     modelFrequencyLocal.value.isValid =
       newValue2 === 'never' ? false : !!newValue1
+
+    newValue2 === 'never' && (modelFrequencyLocal.value.frg_end_time = '')
   }
 )
 </script>

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

@@ -146,25 +146,40 @@ const generateOnceCronExpression = (date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
 }
-const generateHourlyCronExpression = (delay: string, date: Date): any => {
+const generateHourlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
   if (!date) return
 
+  const startOnTimestamp = 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 `0 */${delay} * * *`
+  return endTimestamp
+    ? `0 */${data.frg_interval} * * * start=${startOnTimestamp},end=${endTimestamp}`
+    : `0 */${data.frg_interval} * * * start=${startOnTimestamp}`
 }
-const generateDaylyCronExpression = (delay: string, date: Date): string => {
+const generateDaylyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
   if (!date) return
 
-  // const minutes = date.getMinutes()
-  // const hours = date.getHours()
-  // const day = date.getDate()
+  const startOnTimestamp = 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 `0 0 */${delay} * *`
+  return endTimestamp
+    ? `0 0 */${data.frg_interval} * * start=${startOnTimestamp},end=${endTimestamp}`
+    : `0 0 */${data.frg_interval} * * start=${startOnTimestamp}`
+
   // return `${minutes} ${hours} ${day}/${delay} * *`
 }
 const generateWeeklyCronExpression = (
@@ -172,25 +187,39 @@ const generateWeeklyCronExpression = (
 ): string => {
   const { frg_on_week_days } = data
 
-  // Генерируем cron-выражение
-  return `* * * * ${frg_on_week_days.join(',')}`
+  const startOnTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  return endTimestamp
+    ? `* * * * ${frg_on_week_days.join(',')}/${
+        data.frg_interval
+      } start=${startOnTimestamp},end=${endTimestamp}`
+    : `* * * * ${frg_on_week_days.join(',')}/${
+        data.frg_interval
+      } start=${startOnTimestamp}`
 }
+
 const generateMonthlyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
   const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
     data
 
-  const startOn = new Date(data.frg_start_on_time)
-  const end = new Date(data.frg_end_time)
+  const startOnTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  console.log(startOn, end)
   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 : '*'
 
   // Генерируем cron-выражение
-  return `* * ${month} */${frg_interval} ${dayOfWeek}`
+  return endTimestamp
+    ? `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp},end=${endTimestamp}`
+    : `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp}`
 }
 
 const generateCronExpression = (
@@ -212,18 +241,10 @@ const generateCronExpression = (
       cronExpression = `0 0 0 0 0 after_procurator_startup${suffixDelay}` // Выполняется после запуска procurator_startup с задержой N минут
       break
     case 'hour':
-      const hourlyDelay = interval.frg_interval
-      cronExpression = generateHourlyCronExpression(
-        hourlyDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = generateHourlyCronExpression(interval)
       break
     case 'day':
-      const dayDelay = interval.frg_interval
-      cronExpression = generateDaylyCronExpression(
-        dayDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = generateDaylyCronExpression(interval)
       break
     case 'week':
       cronExpression = generateWeeklyCronExpression(interval)

package/package.json

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