app/Http/Controllers/AdminUserController.php

@@ -10,8 +10,6 @@ use App\Http\Resources\AdminUserResource;
 use App\Models\AdminUser;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class AdminUserController extends Controller
 {
@@ -46,7 +44,6 @@ class AdminUserController extends Controller
 
             return $this->error('添加失败，请稍后再试');
         }
-        (new OperationLogService())->inLog(OperationType::Create, '', $user, $request->input());
 
         return $this->success('添加成功');
     }
@@ -79,7 +76,6 @@ class AdminUserController extends Controller
 
             return $this->error('修改失败，请稍后再试');
         }
-        (new OperationLogService())->inLog(OperationType::Update, '', $adminUser, $request->input());
 
         return $this->success('修改成功！');
     }
@@ -101,7 +97,6 @@ class AdminUserController extends Controller
 
             return $this->error('删除失败，请稍后再试');
         }
-        (new OperationLogService())->inLog(OperationType::Delete, '', $adminUser);
 
         return $this->success('删除成功！');
     }
@@ -121,10 +116,6 @@ class AdminUserController extends Controller
             'is_enable' => (int) ! $adminUser->is_enable,
         ]);
 
-        $statusMsg = $adminUser->is_enable ? '禁用':'启用';
-
-        (new OperationLogService())->inLog(OperationType::Update, $statusMsg.'-用户【'.$adminUser->name.'】');
-
         return $this->success('操作成功！');
     }
 
@@ -137,9 +128,6 @@ class AdminUserController extends Controller
             'password' => bcrypt($request->input('password')),
         ]);
 
-        $statusMsg = '修改密码';
-        (new OperationLogService())->inLog(OperationType::Update, $statusMsg.'-用户【'.$adminUser->name.'】');
-
         return $this->success('修改成功！');
     }
 }

app/Http/Controllers/AgriculturalBaseController.php

@@ -12,8 +12,6 @@ use App\Models\AgriculturalBase;
 use App\Models\Device;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class AgriculturalBaseController extends Controller
 {
@@ -53,7 +51,6 @@ class AgriculturalBaseController extends Controller
 
             return $this->error('添加失败，请稍后再试');
         }
-        (new OperationLogService())->inLog(OperationType::Create, '', $base, $request->input());
 
         return $this->success('添加成功！');
     }
@@ -86,8 +83,6 @@ class AgriculturalBaseController extends Controller
             return $this->error('修改失败，请稍后再试');
         }
 
-        (new OperationLogService())->inLog(OperationType::Update, '', $agriculturalBasic, $request->input());
-
         return $this->success('修改成功！');
     }
 
@@ -105,8 +100,6 @@ class AgriculturalBaseController extends Controller
             return $this->error('删除失败，请稍后再试');
         }
 
-        (new OperationLogService())->inLog(OperationType::Delete, '', $agriculturalBasic);
-
         return $this->success('删除成功！');
     }
 

app/Http/Controllers/CityDataController.php

@@ -4,8 +4,6 @@ namespace App\Http\Controllers;
 
 use Peidikeji\Setting\Models\Setting;
 use Illuminate\Http\Request;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class CityDataController extends Controller
 {
@@ -37,9 +35,7 @@ class CityDataController extends Controller
                 Setting::where('slug', $key)->update(['value->value'=>$value]);
             }
         }
-
-        (new OperationLogService())->inLog(OperationType::Update, '修改-全市基础数据统计', null, $input);
-
+        
         return $this->success();
     }
 }

app/Http/Controllers/CropController.php

@@ -7,8 +7,6 @@ use App\Http\Resources\CropResource;
 use App\Models\Crop;
 use App\Models\CropYield;
 use Illuminate\Http\Request;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class CropController extends Controller
 {
@@ -28,9 +26,7 @@ class CropController extends Controller
             $parent = Crop::findOrFail($input['parent_id']);
             $input['path'] = ($parent?->path ?? '').$parent?->id.'-';
         }
-        $crop = Crop::create($input);
-
-        (new OperationLogService())->inLog(OperationType::Create, '', $crop, $request->input());
+        Crop::create($input);
 
         return $this->success('添加成功');
     }
@@ -61,8 +57,6 @@ class CropController extends Controller
 
         $crop->update(array_merge($request->input(), $input));
 
-        (new OperationLogService())->inLog(OperationType::Update, '', $crop, $request->input());
-
         return $this->success('修改成功');
     }
 
@@ -79,8 +73,6 @@ class CropController extends Controller
 
         $crop->delete();
 
-        (new OperationLogService())->inLog(OperationType::Delete, '', $crop);
-
         return $this->success('删除成功');
     }
 }

app/Http/Controllers/CropYieldController.php

@@ -11,8 +11,6 @@ use App\Models\CropYield;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Peidikeji\Keywords\Models\Keywords;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class CropYieldController extends Controller
 {
@@ -44,14 +42,12 @@ class CropYieldController extends Controller
 
         $crop = Crop::find($cropId);
 
-        $cropYield = CropYield::create(array_merge($request->input(), [
+        CropYield::create(array_merge($request->input(), [
             'category_id' => $crop->category_id ?? 0,
             'created_by' => auth('api')->user()?->id ?? 0,
             'updated_by' => auth('api')->user()?->id ?? 0,
         ]));
 
-        (new OperationLogService())->inLog(OperationType::Create, '', $cropYield, $request->input());
-
         return $this->success('添加成功');
     }
 
@@ -84,8 +80,6 @@ class CropYieldController extends Controller
             'updated_by' => auth('api')->user()?->id ?? 0,
         ]));
 
-        (new OperationLogService())->inLog(OperationType::Update, '', $cropYield, $request->input());
-
         return $this->success('修改成功');
     }
 
@@ -93,8 +87,6 @@ class CropYieldController extends Controller
     {
         $cropYield->delete();
 
-        (new OperationLogService())->inLog(OperationType::Delete, '', $cropYield);
-
         return $this->success('删除成功');
     }
 

app/Http/Controllers/DeviceController.php

@@ -18,8 +18,6 @@ use App\Models\AgriculturalBase;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Carbon\Carbon;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class DeviceController extends Controller
 {
@@ -38,13 +36,11 @@ class DeviceController extends Controller
         if ($input['type'] != DeviceType::Monitor->value) {
             unset($input['extends']);
         }
-        $device = Device::create(array_merge($input, [
+        Device::create(array_merge($input, [
             'created_by' => auth('api')->user()?->id ?? 0,
             'updated_by' => auth('api')->user()?->id ?? 0,
         ]));
 
-        (new OperationLogService())->inLog(OperationType::Create, '', $device, $request->input());
-
         return $this->success('添加成功');
     }
 
@@ -64,8 +60,6 @@ class DeviceController extends Controller
             'updated_by' => auth('api')->user()?->id ?? 0,
         ]));
 
-        (new OperationLogService())->inLog(OperationType::Update, '', $device, $request->input());
-
         return $this->success('修改成功');
     }
 
@@ -73,8 +67,6 @@ class DeviceController extends Controller
     {
         $device->delete();
 
-        (new OperationLogService())->inLog(OperationType::Delete, '', $device);
-
         return $this->success('删除成功');
     }
 

app/Http/Controllers/OperationLogController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Helpers\Paginator;
-use App\Models\OperationLog;
-use App\Http\Resources\OperationLogResource;
-use Illuminate\Http\Request;
-
-class OperationLogController extends Controller
-{
-    public function index(Request $request)
-    {
-        $query = OperationLog::filter($request->all())->orderBy('created_at', 'desc');
-
-        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
-
-        return $this->json(OperationLogResource::collection($list));
-    }
-}

app/Http/Resources/OperationLogResource.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class OperationLogResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'user_name' => $this->user_name,
-            'type' => $this->type,
-            'message' => $this->message,
-            'input_data' => $this->input_data,
-            'created_at' => strtotime($this->created_at) ?? 0, //录入时间
-        ];
-    }
-}

app/ModelFilters/OperationLogFilter.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\ModelFilters;
-
-use EloquentFilter\ModelFilter;
-
-class OperationLogFilter extends ModelFilter
-{
-    public function type($type){
-        return $this->where('type', $type);
-    }
-
-    public function user($user){
-        return $this->where('user_id', $user);
-    }
-}

app/Models/OperationLog.php

@@ -5,11 +5,10 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use App\Enums\OperationType;
-use EloquentFilter\Filterable;
 
 class OperationLog extends Model
 {
-    use HasFactory, Filterable;
+    use HasFactory;
 
     protected $casts = [
         'type' => OperationType::class,

app/Services/OperationLogService.php

@@ -11,7 +11,7 @@ class OperationLogService
     public function inLog(OperationType $type, ? String $message = '',? Model $model = null, ? Array $parms = null){
         $user = auth('api')->user();
         if(!$message){//如果没传message
-            $message = (OperationType::types()[$type->value] ?? '') .'-'. __("models.".($model ? $model::class : "")). '【'.($model?->name ?? ($model?->id ?? 0)) .'】';
+            $message = (OperationType::types()[$type->value] ?? '') . __("models.".($model ? $model::class : "")). '【'.($model?->name ?? ($model?->id ?? 0)) .'】';
         }
         $data = [
             'user_id' => $user?->id ?? 0,

routes/api.php

@@ -59,9 +59,6 @@ Route::group(['middleware' => 'auth:sanctum'], function () {
         //友情链接
         Route::apiResource('friend-links', FriendLinkController::class)->only(['index'])->names('friend_links');
 
-        //操作日志
-        Route::apiResource('operation-logs', OperationLogController::class)->only(['index'])->names('operation_logs');
-
         /**统计 **/
         Route::get('crop-yield-quarter-statics', [CropYieldController::class, 'quarterStaticsChart']); //季度统计
         Route::get('crop-yield-category-statics', [CropYieldController::class, 'categoryStaticsChart']); //行业统计产值