bfg-common 1.4.278 → 1.4.279

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

@@ -155,7 +155,7 @@ const generateHourlyCronExpression = (delay: string, date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours}/${delay} * * *`
 }
-const generateDaylyCronExpression = (delay: string, date: Date): any => {
+const generateDaylyCronExpression = (delay: string, date: Date): string => {
   if (!date) return
 
   const minutes = date.getMinutes()
@@ -165,6 +165,25 @@ const generateDaylyCronExpression = (delay: string, date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours} ${day}/${delay} * *`
 }
+const generateWeeklyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_on_week_days } = data
+
+  // Генерируем cron-выражение
+  return `* * * * ${frg_on_week_days.join(',')}`
+}
+const generateMonthlyCronExpression = (delay: string, date: Date): string => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+  const day = date.getDate()
+  const month = date.getMonth() + 1
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours} ${day} ${month}/${delay} *`
+}
 
 const generateCronExpression = (
   runType: UI_T_FrequencyType,
@@ -186,22 +205,25 @@ const generateCronExpression = (
       cronExpression = `${delay} * * * * after_procurator_startup` // Выполняется каждые N минут после запуска  procurator_startup
       break
     case 'hour':
-      const hourlyDelay = `*/${interval.frg_interval}`
+      const hourlyDelay = interval.frg_interval
       const date =
         interval.frg_start_on_time && new Date(interval.frg_start_on_time)
       cronExpression = generateHourlyCronExpression(hourlyDelay, date)
       break
     case 'day':
-      const daylyDelay = `*/${interval.frg_interval}`
+      const dayDelay = interval.frg_interval
       const date =
         interval.frg_start_on_time && new Date(interval.frg_start_on_time)
-      cronExpression = generateDaylyCronExpression(daylyDelay, date)
+      cronExpression = generateDaylyCronExpression(dayDelay, date)
       break
     case 'week':
-      cronExpression = `* * * * *` // Выполнение раз в неделю
+      cronExpression = generateWeeklyCronExpression(interval)
       break
     case 'month':
-      cronExpression = `* * * * *` // Выполнение раз в неделю
+      const monthDelay = interval.frg_interval
+      const date =
+        interval.frg_start_on_time && new Date(interval.frg_start_on_time)
+      cronExpression = generateMonthlyCronExpression(monthDelay, date)
       break
     default:
       cronExpression = '* * * * *'

package/package.json

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