From 4fa9a8a297b21fd341c7aef1b2ceb44595cd94cd Mon Sep 17 00:00:00 2001 From: "OU.ZAIKOU" Date: Thu, 5 Feb 2026 11:26:52 +0900 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=88=BB=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/CityController.php | 97 ++++- resources/views/layouts/app.blade.php | 332 ++++++++++-------- routes/web.php | 108 ++---- 3 files changed, 290 insertions(+), 247 deletions(-) diff --git a/app/Http/Controllers/Admin/CityController.php b/app/Http/Controllers/Admin/CityController.php index 55cba28..4b74717 100644 --- a/app/Http/Controllers/Admin/CityController.php +++ b/app/Http/Controllers/Admin/CityController.php @@ -1,47 +1,53 @@ input('sort', 'city_id'); - $sortType = (string) $request->input('sort_type', 'asc'); - $page = (int) $request->get('page', 1); + $sort = $request->input('sort', 'city_id'); + $sortType = $request->input('sort_type', 'asc'); + $page = $request->get('page', 1); + $menuAccessService = app(\App\Services\MenuAccessService::class); + + // メニューアクセス制御: 非ソーリンユーザーは所属自治体のみ表示 $query = City::query(); + if (!$menuAccessService->isSorin()) { + $operator = auth()->user(); + if ($operator && isset($operator->management_id)) { + $query->where('management_id', $operator->management_id); + } + } if ($request->filled('city_name')) { $query->where('city_name', 'like', '%' . $request->input('city_name') . '%'); } - // 排序处理 + // ソート処理 if (!empty($sort)) { $query->orderBy($sort, $sortType); } $list = $query->paginate(20); - // 页码越界处理 + // インデックス超過処理 if ($list->total() > 0 && $page > $list->lastPage()) { - return redirect()->route('cities.index', [ + return redirect()->route('city', [ 'sort' => $sort, 'sort_type' => $sortType, ]); } - return view('admin.cities.index', [ + return view('admin.CityMaster.list', [ + 'isMethodPost' => $request->isMethod('post'), 'sort' => $sort, 'sort_type' => $sortType, 'list' => $list, @@ -49,7 +55,7 @@ final class CityController extends Controller ]); } - public function create(): View + public function add(Request $request) { $inputs = [ 'city_name' => '', @@ -112,6 +118,12 @@ final class CityController extends Controller abort(404); } + // メニューアクセス制御確認 + $menuAccessService = app(\App\Services\MenuAccessService::class); + if (!$menuAccessService->canAccessCity($city->city_id)) { + abort(403, 'この自治体へのアクセス権限がありません。'); + } + if ($request->isMethod('POST')) { $rules = [ 'city_name' => ['required', 'string', 'max:10', 'regex:/^[^ -~｡-ﾟ]+$/u'], @@ -174,4 +186,53 @@ final class CityController extends Controller return redirect()->route('city')->with('error', __('削除に失敗しました。')); } } + + /** + * 自治体ダッシュボード + */ + public function dashboard(Request $request, $city_id) + { + $city = City::find($city_id); + if (!$city) { + return redirect()->route('city')->with('error', '指定された自治体が見つかりません。'); + } + + // この自治体に関連する駐輪場データを取得 + $parks = \App\Models\Park::where('city_id', $city_id)->get(); + $parkIds = $parks->pluck('park_id')->toArray(); + + // この自治体の統計情報を取得 + $contractsCount = 0; + $usersCount = 0; + $waitingCount = 0; + + if (!empty($parkIds)) { + // 契約数を取得 + $contractsCount = \App\Models\RegularContract::whereIn('park_id', $parkIds)->count(); + + // この自治体の駐輪場で契約しているユニークユーザー数を取得 + $userIds = \App\Models\RegularContract::whereIn('park_id', $parkIds) + ->distinct() + ->pluck('user_id') + ->toArray(); + $usersCount = count(array_filter($userIds)); + + // 予約待ち人数を取得（valid_flag = 1 かつ reserve_order が設定されているもの） + $waitingCount = DB::table('reserve') + ->whereIn('park_id', $parkIds) + ->where('valid_flag', 1) + ->whereNotNull('reserve_order') + ->where('reserve_order', '>', 0) + ->count(); + } + + $stats = [ + 'parks_count' => $parks->count(), + 'contracts_count' => $contractsCount, + 'users_count' => $usersCount, + 'waiting_count' => $waitingCount, + ]; + + return view('admin.CityMaster.dashboard', compact('city', 'parks', 'stats')); + } } \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 2567dee..f2835b2 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -300,6 +300,7 @@ タグ発行キュー処理、履歴表示 + @@ -522,58 +523,66 @@ - @php - // 利用者マスタ：ルート名がここに含まれている場合、展開＆ハイライト - $userGroupRoutes = [ - 'users', // 利用者マスタ - 'regularcontracts', // 定期契約マスタ - 'reserves', // 定期予約マスタ - 'usertypes', // 定期予約マスタ - ]; - @endphp + + @php + $systemRoutes = ['opes', 'devices', 'operator_ques', 'settings', 'mail_templates']; + @endphp +
  • + + +

    システムマスタ

    +     + +
    • -
  • - - -

    - 利用者マスタ - -

    -     - - -
    • + + @php + $masterRoutes = ['inv_settings', 'lottery.master', 'lottery.setting']; + @endphp +
  • + + +

    マスタ管理

    +     + +
    • @@ -599,108 +608,125 @@ $masterRoutes = ['inv_settings', 'lottery.master', 'lottery.setting']; @endphp - -
  • - - -

    - {{ __("駐輪場マスタ") }} - -

    -     - -
    • + +
  • + + +

    ホーム

    +     + +
    • + + +
  • + + +

    タグ・シール管理

    +     + +
    • + + +
  • + + +

    定期駐輪管理

    +     + +
    • + + +
  • + + +

    集計業務

    +     + +
  • diff --git a/routes/web.php b/routes/web.php index 75a8bbf..5a7c31e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -178,6 +178,12 @@ Route::middleware('auth')->group(function () { // sou end // ou start + // 自治体ダッシュボード + Route::get('/city/{city_id}/dashboard', [CityController::class, 'dashboard']) + ->where(['city_id' => '[0-9]+']) + ->name('city_dashboard') + ->middleware('check.city.access'); + // 市区マスタ Route::match(['get', 'post'], '/city', [CityController::class, 'list'])->name('city'); Route::match(['get', 'post'], '/city/add', [CityController::class, 'add'])->name('city_add'); @@ -185,48 +191,15 @@ Route::middleware('auth')->group(function () { Route::match(['get', 'post'], '/city/info/{id}', [CityController::class, 'info'])->where(['id' => '[0-9]+'])->name('city_info'); Route::match(['get', 'post'], '/city/delete', [CityController::class, 'delete'])->name('city_delete'); - // 駐輪場マスタ（parks.*） - Route::prefix('parks')->group(function () { - - // 一覧（画面） - Route::get('/', [ParkController::class, 'index']) - ->name('parks.index'); - - // 新規（画面） - Route::get('/create', [ParkController::class, 'create']) - ->name('parks.create'); - - // 新規（登録） - Route::post('/', [ParkController::class, 'store']) - ->name('parks.store'); - - // 編集（画面） - Route::get('/{id}/edit', [ParkController::class, 'edit']) - ->whereNumber('id') - ->name('parks.edit'); - - // 編集（更新） - Route::post('/{id}', [ParkController::class, 'update']) - ->whereNumber('id') - ->name('parks.update'); - - // 削除（複数削除 pk[]） - Route::post('/delete', [ParkController::class, 'destroy']) - ->name('parks.destroy'); - - // CSV 出力（必要なら） - Route::post('/export', [ParkController::class, 'export']) - ->name('parks.export'); - - // CSV 取込（必要なら） - Route::post('/import', [ParkController::class, 'import']) - ->name('parks.import'); - - // 重複チェック（必要なら） - Route::post('/check-duplicate', [ParkController::class, 'checkDuplicate']) - ->name('parks.check_duplicate'); - }); - + // 駐輪場マスタ + Route::get('/parks', [ParkController::class, 'list'])->name('parks'); + Route::get('/parks/add', [ParkController::class, 'add'])->name('parks.add'); + Route::post('/parks/add', [ParkController::class, 'add'])->name('parks.store'); + Route::match(['get', 'post', 'put'], '/parks/edit/{id}', [ParkController::class, 'edit'])->name('parks.edit'); + Route::put('/parks/edit/{id}', [ParkController::class, 'edit'])->name('parks.update'); + Route::match(['get', 'post'], '/parks/delete', [ParkController::class, 'delete'])->name('parks.delete'); + Route::get('/parks/export', [ParkController::class, 'export'])->name('parks.export'); + Route::post('/parks/check-duplicate', [App\Http\Controllers\Admin\ParkController::class, 'checkDuplicate'])->name('parks.check_duplicate'); // 料金一覧表マスタ Route::match(['get', 'post'], '/admin/pricelist', [PriceListController::class, 'list'])->name('pricelist'); @@ -289,40 +262,12 @@ Route::middleware('auth')->group(function () { Route::match(['get', 'post'], '/regularcontracts/info/{contract_id}', [RegularContractController::class, 'info'])->where(['contract_id' => '[0-9]+'])->name('regularcontracts_info'); Route::match(['get', 'post'], '/regularcontracts/delete', [RegularContractController::class, 'delete'])->name('regularcontracts_delete'); - // 定期予約マスタ（reserves.*） - Route::prefix('reserves')->group(function () { - - // 一覧（画面） - Route::get('/', [ReservesController::class, 'index']) - ->name('reserves.index'); - - // 新規（画面） - Route::get('/create', [ReservesController::class, 'create']) - ->name('reserves.create'); - - // 新規（登録） - Route::post('/', [ReservesController::class, 'store']) - ->name('reserves.store'); - - // 編集（画面） - Route::get('/{reserve_id}/edit', [ReservesController::class, 'edit']) - ->whereNumber('reserve_id') - ->name('reserves.edit'); - - // 編集（更新） - Route::post('/{reserve_id}', [ReservesController::class, 'update']) - ->whereNumber('reserve_id') - ->name('reserves.update'); - - // 削除（複数削除 pk[]） - Route::post('/delete', [ReservesController::class, 'destroy']) - ->name('reserves.destroy'); - - // エクスポート - Route::post('/export', [ReservesController::class, 'export']) - ->name('reserves.export'); - }); - + // 定期予約マスタ + Route::match(['get', 'post'], '/reserves', [ReservesController::class, 'list'])->name('reserves'); + Route::match(['get', 'post'], '/reserves/add', [ReservesController::class, 'add'])->name('reserves_add'); + Route::match(['get', 'post'], '/reserves/edit/{reserve_id}', [ReservesController::class, 'edit'])->name('reserves_edit'); + Route::match(['get', 'post'], '/reserves/delete', [ReservesController::class, 'delete'])->name('reserves_delete'); + Route::match(['get', 'post'], '/reserves/export', [ReservesController::class, 'export'])->name('reserves_export'); // 利用者分類マスタ Route::match(['get', 'post'], '/usertypes', [UsertypeController::class, 'list'])->name('usertypes'); @@ -333,6 +278,17 @@ Route::middleware('auth')->group(function () { Route::match(['get', 'post'], '/usertypes/import', [UsertypeController::class, 'import'])->name('usertypes_import'); Route::match(['get', 'post'], '/usertypes/export', [UsertypeController::class, 'export'])->name('usertypes_export'); + // 減免確認マスタ + Route::get('/reduction-confirm-master', [ReductionConfirmMasterController::class, 'list'])->name('reduction_confirm_list'); + Route::post('/reduction-confirm-master', [ReductionConfirmMasterController::class, 'store'])->name('reduction_confirm_store'); + + // 駐輪規定マスタ + Route::match(['get', 'post'], '/admin/parking-regulations', [ParkingRegulationsController::class, 'list'])->name('parking_regulations_list'); + Route::match(['get', 'post'], '/admin/parking-regulations/add', [ParkingRegulationsController::class, 'add'])->name('parking_regulations_add'); + Route::match(['get', 'post'], '/admin/parking-regulations/edit/{seq}', [ParkingRegulationsController::class, 'edit'])->name('parking_regulations_edit')->where(['seq' => '[0-9]+']); + Route::post('/admin/parking-regulations/update/{seq}', [ParkingRegulationsController::class, 'update'])->name('parking_regulations_update'); + Route::post('/admin/parking-regulations/delete', [ParkingRegulationsController::class, 'delete'])->name('parking_regulations_delete'); + // 契約者一覧