* Refactor cronModel::getCrons, easy to filter crons.

2023-08-07 15:10:18 +08:00
parent 392cc7dc79
commit b0ebeb05a0
1 changed files with 15 additions and 8 deletions
@@ -32,14 +32,21 @@ class cronModel extends model
     */
    public function getCrons($params = '')
    {
-        return $this->dao->select('*')->from(TABLE_CRON)
-            ->where('1=1')
-            ->beginIF(strpos($params, 'nostop') !== false)->andWhere('status')->ne('stop')->fi()
-            ->beginIF($this->config->edition != 'max')
-            ->andWhere('command')->ne('moduleName=measurement&methodName=initCrontabQueue')
-            ->andWhere('command')->ne('moduleName=measurement&methodName=execCrontabQueue')
-            ->fi()
-            ->fetchAll('id');
+        $validCrons = $this->dao->select('*')->from(TABLE_CRON)->fetchAll('id');
+
+        $commandInMaxEdition = array(
+            'moduleName=measurement&methodName=initCrontabQueue',
+            'moduleName=measurement&methodName=execCrontabQueue',
+            'moduleName=weekly&methodName=computeWeekly',
+        );
+        foreach($validCrons as $id => $cron)
+        {
+            if(strpos($params, 'nostop') !== false and $cron->status == 'stop') unset($validCrons[$id]);
+
+            if(in_array($cron->command, $commandInMaxEdition)) unset($validCrons[$id]);
+        }
+
+        return $validCrons;
    }

    /**