diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php index 25f0d3e..7633c76 100644 --- a/app/Http/Controllers/AgriculturalBaseController.php +++ b/app/Http/Controllers/AgriculturalBaseController.php @@ -118,6 +118,9 @@ class AgriculturalBaseController extends Controller $deviceType = $request->input('device_type', DeviceType::Monitor); // $status = $request->input('status'); $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) { + if($deviceType == DeviceType::Monitor || $deviceType == 1){ + $q->where('is_recommend', 1); + } return $q->where('type', $deviceType); })->sort()->get(); diff --git a/database/seeders/SettingTableSeeder.php b/database/seeders/SettingTableSeeder.php index c418094..3a9c1aa 100644 --- a/database/seeders/SettingTableSeeder.php +++ b/database/seeders/SettingTableSeeder.php @@ -110,7 +110,7 @@ class SettingTableSeeder extends Seeder ['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'], ['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule], ['name' => '警报规则-水质设备', 'slug' => 'device_warning_rule_waterquality', 'value' => $waterRule], - ['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'{"ip":"127.0.0.1", "port":"80"}'], + ['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'{"ip":"127.0.0.1", "port":"80", "change_time":"20"}'], ['name' => '统计数据-农业', 'slug' => 'city_data_chart_nongye', 'value'=>'{}'], ['name' => '统计数据-渔业', 'slug' => 'city_data_chart_yuye', 'value'=>'{}'], ['name' => '统计数据-畜牧业', 'slug' => 'city_data_chart_xumuye', 'value'=>'{}'],