|
|
@@ -150,14 +150,20 @@ class CalcConsole extends BaseBusiness
|
|
|
public static function autoPrePerf()
|
|
|
{
|
|
|
$nowTs = time();
|
|
|
- $currentPeriod = Period::find()->where('START_TIME< :NOW_TIME',['NOW_TIME'=>$nowTs])->where('END_TIME>= :NOW_TIME',['NOW_TIME'=>$nowTs-6])->asArray()->one();
|
|
|
- $periodNum = $currentPeriod['PERIOD_NUM'];
|
|
|
- $prevPeriodNum = $periodNum - 1;
|
|
|
-
|
|
|
$nowDate = date("d", $nowTs);
|
|
|
$nowHour = date("H", $nowTs);
|
|
|
$nowMinuter = date('i', $nowTs);
|
|
|
|
|
|
+ // 如果不是整点,则跳过计算
|
|
|
+ if ($nowMinuter == 0) {
|
|
|
+ echo('自动计算未开始. 【非整点时间】' . date('Y-m-d H:i:s') . PHP_EOL);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ $currentPeriod = Period::find()->where('START_TIME< :NOW_TIME',['NOW_TIME'=>$nowTs])->where('END_TIME>= :NOW_TIME',['NOW_TIME'=>$nowTs-6])->asArray()->one();
|
|
|
+ $periodNum = $currentPeriod['PERIOD_NUM'];
|
|
|
+ $prevPeriodNum = $periodNum - 1;
|
|
|
+
|
|
|
// 当计算中,则跳过
|
|
|
if(Period::isPreparing($periodNum)){ // 当计算中,则跳过
|
|
|
echo('自动计算未开始. 【计算中】' . date('Y-m-d H:i:s') . ' 期数:' . $periodNum . PHP_EOL);
|