pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复编码格式

dev
Jing Li 2022-10-11 15:36:53 +08:00
parent cc7b861883
commit 78b6934d86
29 changed files with 767 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Admin/Metrics/Examples/NewDevices.php
View File

@ -55,13 +55,12 @@ class NewDevices extends Donut
* 设置图表数据. * 设置图表数据.
* *
* @param array $data * @param array $data
*
* @return $this * @return $this
*/ */
public function withChart(array $data) public function withChart(array $data)
{ {
return $this->chart([ return $this->chart([
'series' => $data 'series' => $data,
]); ]);
} }
@ -70,7 +69,6 @@ class NewDevices extends Donut
* *
* @param mixed $desktop * @param mixed $desktop
* @param mixed $mobile * @param mixed $mobile
*
* @return $this * @return $this
*/ */
protected function withContent($desktop, $mobile) protected function withContent($desktop, $mobile)

5
app/Admin/Metrics/Examples/NewUsers.php
View File

@ -29,7 +29,6 @@ class NewUsers extends Line
* 处理请求 * 处理请求
* *
* @param Request $request * @param Request $request
*
* @return mixed|void * @return mixed|void
*/ */
public function handle(Request $request) public function handle(Request $request)
@ -64,7 +63,7 @@ class NewUsers extends Line
// 卡片内容 // 卡片内容
$this->withContent('89.2k'); $this->withContent('89.2k');
// 图表数据 // 图表数据
$this->withChart([28, 40, 36, 52, 38, 60, 55,]); $this->withChart([28, 40, 36, 52, 38, 60, 55]);
} }
} }
@ -72,7 +71,6 @@ class NewUsers extends Line
* 设置图表数据. * 设置图表数据.
* *
* @param array $data * @param array $data
*
* @return $this * @return $this
*/ */
public function withChart(array $data) public function withChart(array $data)
@ -91,7 +89,6 @@ class NewUsers extends Line
* 设置卡片内容. * 设置卡片内容.
* *
* @param string $content * @param string $content
*
* @return $this * @return $this
*/ */
public function withContent($content) public function withContent($content)

3
app/Admin/Metrics/Examples/ProductOrders.php
View File

@ -28,7 +28,6 @@ class ProductOrders extends Round
* 处理请求 * 处理请求
* *
* @param Request $request * @param Request $request
*
* @return mixed|void * @return mixed|void
*/ */
public function handle(Request $request) public function handle(Request $request)
@ -54,7 +53,6 @@ class ProductOrders extends Round
* 设置图表数据. * 设置图表数据.
* *
* @param array $data * @param array $data
*
* @return $this * @return $this
*/ */
public function withChart(array $data) public function withChart(array $data)
@ -70,7 +68,6 @@ class ProductOrders extends Round
* @param int $finished * @param int $finished
* @param int $pending * @param int $pending
* @param int $rejected * @param int $rejected
*
* @return $this * @return $this
*/ */
public function withContent($finished, $pending, $rejected) public function withContent($finished, $pending, $rejected)

5
app/Admin/Metrics/Examples/Sessions.php
View File

@ -37,7 +37,7 @@ class Sessions extends Bar
$color->primary(), $color->primary(),
$dark35, $dark35,
$dark35, $dark35,
$dark35 $dark35,
]); ]);
} }
@ -45,7 +45,6 @@ class Sessions extends Bar
* 处理请求 * 处理请求
* *
* @param Request $request * @param Request $request
*
* @return mixed|void * @return mixed|void
*/ */
public function handle(Request $request) public function handle(Request $request)
@ -70,7 +69,6 @@ class Sessions extends Bar
* 设置图表数据. * 设置图表数据.
* *
* @param array $data * @param array $data
*
* @return $this * @return $this
*/ */
public function withChart(array $data) public function withChart(array $data)
@ -86,7 +84,6 @@ class Sessions extends Bar
* @param string $title * @param string $title
* @param string $value * @param string $value
* @param string $style * @param string $style
*
* @return $this * @return $this
*/ */
public function withContent($title, $value, $style = 'success') public function withContent($title, $value, $style = 'success')

4
app/Admin/Metrics/Examples/Tickets.php
View File

@ -30,7 +30,6 @@ class Tickets extends RadialBar
* 处理请求 * 处理请求
* *
* @param Request $request * @param Request $request
*
* @return mixed|void * @return mixed|void
*/ */
public function handle(Request $request) public function handle(Request $request)
@ -54,7 +53,6 @@ class Tickets extends RadialBar
* 设置图表数据. * 设置图表数据.
* *
* @param int $data * @param int $data
*
* @return $this * @return $this
*/ */
public function withChart(int $data) public function withChart(int $data)
@ -68,7 +66,6 @@ class Tickets extends RadialBar
* 卡片内容 * 卡片内容
* *
* @param string $content * @param string $content
*
* @return $this * @return $this
*/ */
public function withContent($content) public function withContent($content)
@ -89,7 +86,6 @@ HTML
* @param string $new * @param string $new
* @param string $open * @param string $open
* @param string $response * @param string $response
*
* @return $this * @return $this
*/ */
public function withFooter($new, $open, $response) public function withFooter($new, $open, $response)

4
app/Admin/Metrics/Examples/TotalUsers.php
View File

@ -35,7 +35,6 @@ class TotalUsers extends Card
* 处理请求. * 处理请求.
* *
* @param Request $request * @param Request $request
*
* @return void * @return void
*/ */
public function handle(Request $request) public function handle(Request $request)
@ -62,7 +61,6 @@ class TotalUsers extends Card
/** /**
* @param int $percent * @param int $percent
*
* @return $this * @return $this
*/ */
public function up($percent) public function up($percent)
@ -74,7 +72,6 @@ class TotalUsers extends Card
/** /**
* @param int $percent * @param int $percent
*
* @return $this * @return $this
*/ */
public function down($percent) public function down($percent)
@ -88,7 +85,6 @@ class TotalUsers extends Card
* 设置卡片底部内容. * 设置卡片底部内容.
* *
* @param string|Renderable|\Closure $footer * @param string|Renderable|\Closure $footer
*
* @return $this * @return $this
*/ */
public function footer($footer) public function footer($footer)

5
app/Admin/bootstrap.php
View File

@ -1,13 +1,11 @@
<?php <?php
use Dcat\Admin\Admin; use Dcat\Admin\Admin;
use Dcat\Admin\Grid;
use Dcat\Admin\Form; use Dcat\Admin\Form;
use Dcat\Admin\Grid\Filter;
use Dcat\Admin\Show;
/** /**
* Dcat-admin - admin builder based on Laravel. * Dcat-admin - admin builder based on Laravel.
*
* @author jqh <https://github.com/jqhph> * @author jqh <https://github.com/jqhph>
* *
* Bootstraper for Admin. * Bootstraper for Admin.
@ -22,5 +20,4 @@ use Dcat\Admin\Show;
* Or require js and css assets: * Or require js and css assets:
* Admin::css('/packages/prettydocs/css/styles.css'); * Admin::css('/packages/prettydocs/css/styles.css');
* Admin::js('/packages/prettydocs/js/main.js'); * Admin::js('/packages/prettydocs/js/main.js');
*
*/ */

4
app/Admin/routes.php
View File

@ -1,8 +1,8 @@
<?php <?php
use Dcat\Admin\Admin;
use Illuminate\Routing\Router; use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Dcat\Admin\Admin;
Admin::routes(); Admin::routes();
@ -11,7 +11,5 @@ Route::group([
'namespace' => config('admin.route.namespace'), 'namespace' => config('admin.route.namespace'),
'middleware' => config('admin.route.middleware'), 'middleware' => config('admin.route.middleware'),
], function (Router $router) { ], function (Router $router) {
$router->get('/', 'HomeController@index'); $router->get('/', 'HomeController@index');
}); });

1
app/Exceptions/Handler.php
View File

@ -133,6 +133,7 @@ class Handler extends ExceptionHandler
'message' => $e->getMessage(), 'message' => $e->getMessage(),
'data' => null, 'data' => null,
]; ];
return $data; return $data;
} elseif ($this->isHttpException($e)) { } elseif ($this->isHttpException($e)) {
$data = [ $data = [

4
app/Http/Controllers/AuthController.php
View File

@ -4,7 +4,6 @@ namespace App\Http\Controllers;
use App\Models\AdminUser; use App\Models\AdminUser;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Exceptions\BizException;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
class AuthController extends Controller class AuthController extends Controller
@ -27,11 +26,10 @@ class AuthController extends Controller
return $this->attemptUser($user); return $this->attemptUser($user);
} }
protected function attemptUser(AdminUser $user, $name = 'api') protected function attemptUser(AdminUser $user, $name = 'api')
{ {
$token = $user->createToken($name)->plainTextToken; $token = $user->createToken($name)->plainTextToken;
return $this->json(['token' => $token, 'info' => $user, 'permissions'=>$user->getCachePermissions()]); return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->getCachePermissions()]);
} }
} }

7
app/Http/Controllers/CityDataController.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Peidikeji\Setting\Models\Setting; use Peidikeji\Setting\Models\Setting;
class CityDataController extends Controller class CityDataController extends Controller
@ -12,11 +11,13 @@ class CityDataController extends Controller
* *
* @return void * @return void
*/ */
public function statistics(){ public function statistics()
{
$settings = Setting::where('slug', 'like', 'city_data_%')->get()->toArray(); $settings = Setting::where('slug', 'like', 'city_data_%')->get()->toArray();
return $this->json(array_map(function($item){ return $this->json(array_map(function ($item) {
$_value = json_decode($item['value'], true); $_value = json_decode($item['value'], true);
return [ return [
'name' => $item['name'], 'name' => $item['name'],
'slug' => $item['slug'], 'slug' => $item['slug'],

6
app/Http/Controllers/Controller.php
View File

@ -3,10 +3,10 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Dcat\Admin\Traits\JsonResponse; use Dcat\Admin\Traits\JsonResponse;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController class Controller extends BaseController
{ {

13
app/Http/Controllers/KeywordController.php
View File

@ -3,8 +3,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Peidikeji\Keywords\Models\Keywords;
use Peidikeji\Keywords\Http\Resources\KeywordResource; use Peidikeji\Keywords\Http\Resources\KeywordResource;
use Peidikeji\Keywords\Models\Keywords;
class KeywordController extends Controller class KeywordController extends Controller
{ {
@ -13,7 +13,8 @@ class KeywordController extends Controller
* *
* @return void * @return void
*/ */
public function crops(Request $request){ public function crops(Request $request)
{
$list = Keywords::filter($request->all())->where('type_key', 'like', 'crops-cate-%')->get(); $list = Keywords::filter($request->all())->where('type_key', 'like', 'crops-cate-%')->get();
return $this->json(KeywordResource::collection($list)); return $this->json(KeywordResource::collection($list));
@ -24,20 +25,22 @@ class KeywordController extends Controller
* *
* @return void * @return void
*/ */
public function cropsCate(Request $request){ public function cropsCate(Request $request)
{
$cropsId = $request->input('crops_id', 0); $cropsId = $request->input('crops_id', 0);
$crops = null; $crops = null;
if($cropsId){ if ($cropsId) {
$crops = Keywords::find($cropsId); $crops = Keywords::find($cropsId);
} }
$query = Keywords::filter($request->all())->where('type_key', 'crops-category'); $query = Keywords::filter($request->all())->where('type_key', 'crops-category');
if($crops){ if ($crops) {
$query->where('id', $crops->parent_id); $query->where('id', $crops->parent_id);
} }
$list = $query->get(); $list = $query->get();
return $this->json(KeywordResource::collection($list)); return $this->json(KeywordResource::collection($list));
} }
} }

5
app/Http/Controllers/UserController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Exceptions\BizException; use App\Exceptions\BizException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
class UserController extends Controller class UserController extends Controller
@ -29,7 +29,8 @@ class UserController extends Controller
return $this->success('修改成功'); return $this->success('修改成功');
} }
public function logout(){ public function logout()
{
$user = auth('api')->user(); $user = auth('api')->user();
$user->tokens()->delete(); $user->tokens()->delete();

4
app/Models/AdminUser.php
View File

@ -14,10 +14,10 @@ class AdminUser extends BaseAdminModel
'usersname', 'usersname',
'password', 'password',
'avatar', 'avatar',
'department', 'phone', 'status', 'is_enable' 'department', 'phone', 'status', 'is_enable',
]; ];
protected $hidden = [ protected $hidden = [
'password', 'remember_token' 'password', 'remember_token',
]; ];
} }

2
config/auth.php
View File

@ -43,7 +43,7 @@ return [
'api' => [ 'api' => [
'driver' => 'sanctum', 'driver' => 'sanctum',
'provider' => 'users', 'provider' => 'users',
] ],
], ],
/* /*

37
database/seeders/KeywordsTableSeeder.php
View File

@ -26,33 +26,34 @@ class KeywordsTableSeeder extends Seeder
Keywords::truncate(); Keywords::truncate();
$list = [ $list = [
['key' => 'crops-category', 'name' => '农作物产业分类', 'value' => '', 'list' => [ ['key' => 'crops-category', 'name' => '农作物产业分类', 'value' => '', 'list' => [
['key' => 'crops-cate-nongye', 'name' => '农业', 'type_key'=>'crops-category', 'value' => '', 'list' =>[ ['key' => 'crops-cate-nongye', 'name' => '农业', 'type_key' => 'crops-category', 'value' => '', 'list' => [
['key' => 'crops-shuidao', 'name' => '水稻', 'type_key'=>'crops-cate-nongye', 'value' => ''], ['key' => 'crops-shuidao', 'name' => '水稻', 'type_key' => 'crops-cate-nongye', 'value' => ''],
['key' => 'crops-papagan', 'name' => '耙耙柑', 'type_key'=>'crops-cate-nongye', 'value' => ''], ['key' => 'crops-papagan', 'name' => '耙耙柑', 'type_key' => 'crops-cate-nongye', 'value' => ''],
['key' => 'crops-aiyuan', 'name' => '爱媛', 'type_key'=>'crops-cate-nongye', 'value' => ''], ['key' => 'crops-aiyuan', 'name' => '爱媛', 'type_key' => 'crops-cate-nongye', 'value' => ''],
['key' => 'crops-buzhihuo', 'name' => '不知火', 'type_key'=>'crops-cate-nongye', 'value' => ''] ['key' => 'crops-buzhihuo', 'name' => '不知火', 'type_key' => 'crops-cate-nongye', 'value' => ''],
]], ]],
['key' => 'crops-cate-yuye', 'name' => '渔业', 'type_key'=>'crops-category', 'value' => '', 'list' =>[ ['key' => 'crops-cate-yuye', 'name' => '渔业', 'type_key' => 'crops-category', 'value' => '', 'list' => [
['key' => 'crops-huocaoyu', 'name' => '活草鱼', 'type_key'=>'crops-cate-yuye', 'value' => ''], ['key' => 'crops-huocaoyu', 'name' => '活草鱼', 'type_key' => 'crops-cate-yuye', 'value' => ''],
['key' => 'crops-daoxia', 'name' => '稻虾', 'type_key'=>'crops-cate-yuye', 'value' => ''], ['key' => 'crops-daoxia', 'name' => '稻虾', 'type_key' => 'crops-cate-yuye', 'value' => ''],
['key' => 'crops-wuyu', 'name' => '乌鱼', 'type_key'=>'crops-cate-yuye', 'value' => ''], ['key' => 'crops-wuyu', 'name' => '乌鱼', 'type_key' => 'crops-cate-yuye', 'value' => ''],
['key' => 'crops-luyu', 'name' => '鲈鱼', 'type_key'=>'crops-cate-yuye', 'value' => ''], ['key' => 'crops-luyu', 'name' => '鲈鱼', 'type_key' => 'crops-cate-yuye', 'value' => ''],
]], ]],
['key' => 'crops-cate-xumuye', 'name' => '畜牧业', 'type_key'=>'crops-category', 'value' => '', 'list' => [ ['key' => 'crops-cate-xumuye', 'name' => '畜牧业', 'type_key' => 'crops-category', 'value' => '', 'list' => [
['key' => 'crops-shengzhu', 'name' => '生猪', 'type_key'=>'crops-cate-xumuye', 'value' => ''], ['key' => 'crops-shengzhu', 'name' => '生猪', 'type_key' => 'crops-cate-xumuye', 'value' => ''],
]], ]],
['key' => 'crops-cate-lingye', 'name' => '林业', 'type_key'=>'crops-category', 'value' => ''], ['key' => 'crops-cate-lingye', 'name' => '林业', 'type_key' => 'crops-category', 'value' => ''],
]], ]],
]; ];
if($list){ if ($list) {
$this->createKeywords($list); $this->createKeywords($list);
} }
} }
private function createKeywords($keywords, $parentType = null){ private function createKeywords($keywords, $parentType = null)
{
foreach ($keywords as $item) { foreach ($keywords as $item) {
if($parentType){ if ($parentType) {
$type = Keywords::create([ $type = Keywords::create([
'name' => $item['name'], 'name' => $item['name'],
'key' => $item['key'] ?? $parentType->key.($parentType + 1), 'key' => $item['key'] ?? $parentType->key.($parentType + 1),
@ -60,11 +61,11 @@ class KeywordsTableSeeder extends Seeder
'level' => ($parentType->level ?? 1) + 1, 'level' => ($parentType->level ?? 1) + 1,
'parent_id' => $parentType->id, 'parent_id' => $parentType->id,
]); ]);
}else{ } else {
$type = Keywords::create(Arr::except($item, 'list')); $type = Keywords::create(Arr::except($item, 'list'));
} }
$list = data_get($item, 'list'); $list = data_get($item, 'list');
if($list){ if ($list) {
$this->createKeywords($list, $type); $this->createKeywords($list, $type);
} }
} }

14
database/seeders/SettingTableSeeder.php
View File

@ -25,13 +25,13 @@ class SettingTableSeeder extends Seeder
Setting::truncate(); Setting::truncate();
$time = now(); $time = now();
$list = [ $list = [
['name' => '全市数据-幅员面积', 'slug'=> 'city_data_area', 'value'=>'{"value":"0", "unit":"平方公里"}'], ['name' => '全市数据-幅员面积', 'slug' => 'city_data_area', 'value' => '{"value":"0", "unit":"平方公里"}'],
['name' => '全市数据-镇街', 'slug'=>'city_data_street', 'value' =>'{"value":"0", "unit":"个"}'], ['name' => '全市数据-镇街', 'slug' => 'city_data_street', 'value' => '{"value":"0", "unit":"个"}'],
['name' => '全市数据-水产品产量', 'slug'=>'city_data_water_ouput', 'value' =>'{"value":"0", "unit":"万吨"}'], ['name' => '全市数据-水产品产量', 'slug' => 'city_data_water_ouput', 'value' => '{"value":"0", "unit":"万吨"}'],
['name' => '全市数据-粮食产量', 'slug'=>'city_data_food_ouput', 'value' =>'{"value":"0", "unit":"万吨"}'], ['name' => '全市数据-粮食产量', 'slug' => 'city_data_food_ouput', 'value' => '{"value":"0", "unit":"万吨"}'],
['name' => '全市数据-人口', 'slug'=>'city_data_population', 'value' =>'{"value":"0", "unit":"万人"}'], ['name' => '全市数据-人口', 'slug' => 'city_data_population', 'value' => '{"value":"0", "unit":"万人"}'],
['name' => '全市数据-耕地总面积', 'slug'=>'city_data_cultivated_area', 'value' =>'{"value":"0", "unit":"万亩"}'], ['name' => '全市数据-耕地总面积', 'slug' => 'city_data_cultivated_area', 'value' => '{"value":"0", "unit":"万亩"}'],
['name' => '全市数据-生猪年出栏', 'slug'=>'city_data_pig_output', 'value' => '{"value":"0", "unit":"万头"}'] ['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"0", "unit":"万头"}'],
]; ];
Setting::insert($list); Setting::insert($list);
} }

5
routes/api.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
/* /*
@ -19,8 +18,8 @@ use Illuminate\Support\Facades\Route;
Route::post('auth/login', [AuthController::class, 'login']); Route::post('auth/login', [AuthController::class, 'login']);
Route::group(['middleware' => 'auth:sanctum'], function () { Route::group(['middleware' => 'auth:sanctum'], function () {
Route::get('keywords-crops', [KeywordController::class, 'crops']);//农作物 Route::get('keywords-crops', [KeywordController::class, 'crops']); //农作物
Route::get('keywords-crops-cate', [KeywordController::class, 'cropsCate']);//农作物产业分类 Route::get('keywords-crops-cate', [KeywordController::class, 'cropsCate']); //农作物产业分类
//全市基础数据 //全市基础数据
Route::get('citydata-statistics', [CityDataController::class, 'statistics']); Route::get('citydata-statistics', [CityDataController::class, 'statistics']);