diff --git a/app/Http/Controllers/CityDataController.php b/app/Http/Controllers/CityDataController.php index d761387..69eee48 100644 --- a/app/Http/Controllers/CityDataController.php +++ b/app/Http/Controllers/CityDataController.php @@ -24,8 +24,8 @@ class CityDataController extends Controller return [ 'name' => $item['name'], 'slug' => $item['slug'], - 'value' => $_value['value'] ?? 0, - 'unit' => $_value['unit'] ?? '未知', + 'value' => $_value['value'] ?? $_value, + 'unit' => $_value['unit'] ?? '万元', ]; }, $settings)); } @@ -33,8 +33,19 @@ class CityDataController extends Controller public function updateStatistics(Request $request){ $input = $request->input(); foreach ($input as $key => $value){ - if(Setting::where('slug', $key)->exists()){ - Setting::where('slug', $key)->update(['value->value'=>$value]); + //如果是更新图表数据 + if(in_array($key, [ + 'city_data_chart_nongye', + 'city_data_chart_yuye', + 'city_data_chart_xumuye', + 'city_data_chart_lingye', + 'city_data_chart_activity' + ])){ + Setting::where('slug', $key)->update(['value'=>json_encode($value)]); + }else{//更新全市基础数据 + if(Setting::where('slug', $key)->exists()){ + Setting::where('slug', $key)->update(['value->value'=>$value]); + } } } diff --git a/database/seeders/SettingTableSeeder.php b/database/seeders/SettingTableSeeder.php index dd1d04c..c418094 100644 --- a/database/seeders/SettingTableSeeder.php +++ b/database/seeders/SettingTableSeeder.php @@ -110,7 +110,12 @@ 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"}'], + ['name' => '统计数据-农业', 'slug' => 'city_data_chart_nongye', 'value'=>'{}'], + ['name' => '统计数据-渔业', 'slug' => 'city_data_chart_yuye', 'value'=>'{}'], + ['name' => '统计数据-畜牧业', 'slug' => 'city_data_chart_xumuye', 'value'=>'{}'], + ['name' => '统计数据-林业', 'slug' => 'city_data_chart_lingye', 'value'=>'{}'], + ['name' => '统计数据-其他', 'slug' => 'city_data_chart_activity', 'value'=>'{}'], ]; Setting::insert($list); }