From e13ca5cf4b30add860df94e76703346c85498050 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Wed, 25 Oct 2023 10:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=A7=E4=B8=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Requestes/MaterielStoreRequest.php | 3 +- app/Http/Requestes/MaterielUpdateRequest.php | 3 +- .../Requestes/RiceShrimpFlowStoreRequest.php | 3 +- .../Requestes/RiceShrimpFlowUpdateRequest.php | 3 +- .../RiceShrimpIndustryStoreRequest.php | 3 +- .../RiceShrimpIndustryUpdateRequest.php | 3 +- .../Requestes/RiceShrimpPriceStoreRequest.php | 5 ++-- .../RiceShrimpPriceUpdateRequest.php | 5 ++-- .../RiceShrimpWeeklyPriceStoreRequest.php | 5 ++-- .../RiceShrimpWeeklyPriceUpdateRequest.php | 5 ++-- app/Rules/Year.php | 30 +++++++++++++++++++ 11 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 app/Rules/Year.php diff --git a/app/Http/Requestes/MaterielStoreRequest.php b/app/Http/Requestes/MaterielStoreRequest.php index 25ad45a..d25b05f 100644 --- a/app/Http/Requestes/MaterielStoreRequest.php +++ b/app/Http/Requestes/MaterielStoreRequest.php @@ -4,6 +4,7 @@ namespace App\Http\Requestes; use App\Enums\MaterielType; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Enum; @@ -17,7 +18,7 @@ class MaterielStoreRequest extends FormRequest public function rules() { return [ - 'year' => ['bail', 'required', 'int'], + 'year' => ['bail', 'required', 'int', new Year()], 'quarter' => ['bail', 'required', new Quarter()], 'name' => ['bail', 'required', 'string', 'max:255'], 'type' => ['bail', 'required', new Enum(MaterielType::class)], diff --git a/app/Http/Requestes/MaterielUpdateRequest.php b/app/Http/Requestes/MaterielUpdateRequest.php index 7fca878..bfcb7c6 100644 --- a/app/Http/Requestes/MaterielUpdateRequest.php +++ b/app/Http/Requestes/MaterielUpdateRequest.php @@ -4,6 +4,7 @@ namespace App\Http\Requestes; use App\Enums\MaterielType; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Enum; @@ -17,7 +18,7 @@ class MaterielUpdateRequest extends FormRequest public function rules() { return [ - 'year' => ['filled', 'int'], + 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], 'name' => ['filled', 'string', 'max:255'], 'type' => ['filled', new Enum(MaterielType::class)], diff --git a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php index 1eba1bb..72a1a6d 100644 --- a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpFlowStoreRequest extends FormRequest @@ -15,7 +16,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest public function rules() { return [ - 'year' => ['required', 'int'], + 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], 'area' => ['required', 'string'], 'sales' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], diff --git a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php index daeec84..b0e5d82 100644 --- a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpFlowUpdateRequest extends FormRequest @@ -15,7 +16,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest public function rules() { return [ - 'year' => ['filled', 'int'], + 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], 'area' => ['filled', 'string'], 'sales' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], diff --git a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php index 4cf3bb8..fadeb1c 100644 --- a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpIndustryStoreRequest extends FormRequest @@ -15,7 +16,7 @@ class RiceShrimpIndustryStoreRequest extends FormRequest public function rules() { return [ - 'year' => ['required', 'int'], + 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], 'area' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['required', 'string'], diff --git a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php index e8a8c77..1a1f102 100644 --- a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpIndustryUpdateRequest extends FormRequest @@ -15,7 +16,7 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest public function rules() { return [ - 'year' => ['filled', 'int'], + 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], 'area' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['filled', 'string'], diff --git a/app/Http/Requestes/RiceShrimpPriceStoreRequest.php b/app/Http/Requestes/RiceShrimpPriceStoreRequest.php index bd3d094..c97b17c 100644 --- a/app/Http/Requestes/RiceShrimpPriceStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpPriceStoreRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpPriceStoreRequest extends FormRequest @@ -15,9 +16,9 @@ class RiceShrimpPriceStoreRequest extends FormRequest public function rules() { return [ - 'year' => ['required', 'int'], + 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], - 'price' => ['required', 'int'], + 'price' => ['required', 'int', 'gte:0'], ]; } diff --git a/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php b/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php index ae835eb..947e126 100644 --- a/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requestes; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; class RiceShrimpPriceUpdateRequest extends FormRequest @@ -15,9 +16,9 @@ class RiceShrimpPriceUpdateRequest extends FormRequest public function rules() { return [ - 'year' => ['filled', 'int'], + 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], - 'price' => ['filled', 'int'], + 'price' => ['filled', 'int', 'gte:0'], ]; } diff --git a/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php b/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php index 283803d..834a78e 100644 --- a/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php @@ -4,6 +4,7 @@ namespace App\Http\Requestes; use App\Models\RiceShrimpWeeklyPrice; use App\Rules\Quarter; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; use Peidikeji\Keywords\Models\Keywords; @@ -18,7 +19,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest public function rules() { return [ - 'year' => ['required', 'int'], + 'year' => ['required', 'int', new Year()], 'week' => [ 'required', 'int', @@ -26,7 +27,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest return $query->where('type_key', 'weeks-per-year'); }), ], - 'price' => ['required', 'int'], + 'price' => ['required', 'int', 'gte:0'], ]; } diff --git a/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php b/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php index c7eb407..1ef5d4f 100644 --- a/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requestes; +use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; use Peidikeji\Keywords\Models\Keywords; @@ -16,7 +17,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest public function rules() { return [ - 'year' => ['filled', 'int'], + 'year' => ['filled', 'int', new Year()], 'week' => [ 'filled', 'int', @@ -24,7 +25,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest return $query->where('type_key', 'weeks-per-year'); }), ], - 'price' => ['filled', 'int'], + 'price' => ['filled', 'int', 'gte:0'], ]; } diff --git a/app/Rules/Year.php b/app/Rules/Year.php new file mode 100644 index 0000000..b458464 --- /dev/null +++ b/app/Rules/Year.php @@ -0,0 +1,30 @@ +year; + } + + /** + * Get the validation error message. + * + * @return string + */ + public function message() + { + return ':attribute 不能超过现在'; + } +}