From cd9a6bc3d0906b8d11f9dea87b4aa404d803adc3 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 28 Aug 2023 16:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=AB=E6=83=85=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/BiAng/WormStatisticsSyncCommand.php | 6 +++--- app/Models/{WormStatisticsReport.php => WormReport.php} | 2 +- ...php => 2023_08_012_155228_create_worm_reports_table.php} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename app/Models/{WormStatisticsReport.php => WormReport.php} (89%) rename database/migrations/{2023_08_012_155228_create_worm_statistics_reports_table.php => 2023_08_012_155228_create_worm_reports_table.php} (85%) diff --git a/app/Console/Commands/BiAng/WormStatisticsSyncCommand.php b/app/Console/Commands/BiAng/WormStatisticsSyncCommand.php index 2c8b945..9b6c04b 100644 --- a/app/Console/Commands/BiAng/WormStatisticsSyncCommand.php +++ b/app/Console/Commands/BiAng/WormStatisticsSyncCommand.php @@ -5,7 +5,7 @@ namespace App\Console\Commands\BiAng; use App\Enums\DeviceStatus; use App\Enums\DeviceType; use App\Models\Device; -use App\Models\WormStatisticsReport; +use App\Models\WormReport; use App\Services\BiAngDeviceService; use Illuminate\Console\Command; use Illuminate\Support\Arr; @@ -53,7 +53,7 @@ class WormStatisticsSyncCommand extends Command foreach ($devices as $device) { $this->info('=================================='); - $latestReportedAt = WormStatisticsReport::Where('device_id', $device->id)->latest('reported_at')->value('reported_at'); + $latestReportedAt = WormReport::Where('device_id', $device->id)->latest('reported_at')->value('reported_at'); $start = $latestReportedAt ? $latestReportedAt->copy() : $today->copy()->subDays(179); @@ -76,7 +76,7 @@ class WormStatisticsSyncCommand extends Command foreach (data_get($statistics, 'data.records', []) as $item) { $data = collect(Arr::except($item, '日期'))->map(fn ($v, $k) => ['name' => $k, 'num' => $v]); - WormStatisticsReport::updateOrCreate([ + WormReport::updateOrCreate([ 'device_id' => $device->id, 'reported_at' => $item['日期'], ], [ diff --git a/app/Models/WormStatisticsReport.php b/app/Models/WormReport.php similarity index 89% rename from app/Models/WormStatisticsReport.php rename to app/Models/WormReport.php index a2b3e81..14cca95 100644 --- a/app/Models/WormStatisticsReport.php +++ b/app/Models/WormReport.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class WormStatisticsReport extends Model +class WormReport extends Model { use HasFactory; diff --git a/database/migrations/2023_08_012_155228_create_worm_statistics_reports_table.php b/database/migrations/2023_08_012_155228_create_worm_reports_table.php similarity index 85% rename from database/migrations/2023_08_012_155228_create_worm_statistics_reports_table.php rename to database/migrations/2023_08_012_155228_create_worm_reports_table.php index f01d306..94f1a1c 100644 --- a/database/migrations/2023_08_012_155228_create_worm_statistics_reports_table.php +++ b/database/migrations/2023_08_012_155228_create_worm_reports_table.php @@ -13,7 +13,7 @@ return new class extends Migration */ public function up() { - Schema::create('worm_statistics_reports', function (Blueprint $table) { + Schema::create('worm_reports', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('device_id'); $table->unsignedBigInteger('agricultural_base_id')->comment('农业基地ID'); @@ -31,6 +31,6 @@ return new class extends Migration */ public function down() { - Schema::dropIfExists('worm_statistics_reports'); + Schema::dropIfExists('worm_reports'); } };