添加删除7天之前操作

addons/admin/src/views/vip/vip.vue

@@ -70,12 +70,11 @@
                             </el-tag>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="remark" label="备注" min-width="60" align="center" fixed="left" />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template slot-scope="{ row }">
                             <el-button v-if="permission.includes(permissionMap['edit'])" type="text" size="mini"
                                 @click="openForm(row)">编辑</el-button>
-                            <el-button v-if="permission.includes(permissionMap['delete'])" type="text" size="mini"
-                                @click="remove(row)">删除</el-button>
                         </template>
                     </el-table-column>
                 </template>

app/Services/Common/ActionLogService.php

@@ -62,4 +62,16 @@ class ActionLogService extends BaseService
         }
         return message("操作成功", true, $list);
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除操作日志信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/AdService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\AdModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\RedisService;
 
@@ -87,4 +88,16 @@ class AdService extends BaseService
         return parent::edit($data); // TODO: Change the autogenerated stub
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除广告信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/AnswerRanksService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\UserModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\ConfigService;
 use Illuminate\Support\Facades\DB;
@@ -151,4 +152,16 @@ class AnswerRanksService extends BaseService
             'limit' => $limit,
         ];
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除答题排行信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/ArticleService.php

@@ -146,4 +146,16 @@ class ArticleService extends BaseService
         }
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除文章信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/CityService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\CityModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -69,4 +70,16 @@ class CityService extends BaseService
         return message("操作成功", true, $list);
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除城市信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/ComplaintService.php

@@ -98,4 +98,16 @@ class ComplaintService extends BaseService
 
         return parent::edit($data);
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除投诉建议信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/ConfigGroupService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\ConfigGroupModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -38,4 +39,16 @@ class ConfigGroupService extends BaseService
     {
         return parent::getList([],[['sort','desc']]); // TODO: Change the autogenerated stub
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除配置分组信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/ConfigService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\ConfigModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -85,4 +86,16 @@ class ConfigService extends BaseService
         return parent::edit($data); // TODO: Change the autogenerated stub
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除配置信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/DepositService.php

@@ -15,6 +15,7 @@ use App\Models\AccountLogModel;
 use App\Models\DepositModel;
 use App\Models\MemberModel;
 use App\Models\MessageModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\ConfigService;
 use App\Services\PaymentService;
@@ -357,4 +358,16 @@ class DepositService extends BaseService
         return $data;
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除充值记录信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/ExamAccessLogsService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\UserModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\ConfigService;
 use Illuminate\Support\Facades\DB;
@@ -113,4 +114,16 @@ class ExamAccessLogsService extends BaseService
         ];
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除考试访问日志信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/GoodsService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\GoodsModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\RedisService;
 use wxkxklmyt\Scws;
@@ -243,4 +244,16 @@ class GoodsService extends BaseService
 
         return $data;
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除商品信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/LoginService.php

@@ -174,4 +174,16 @@ class LoginService extends BaseService
         return message();
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除登录记录信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/MenuService.php

@@ -13,6 +13,7 @@ namespace App\Services\Common;
 
 
 use App\Models\MenuModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -301,4 +302,16 @@ class MenuService extends BaseService
         return array_filter(array_values($list));
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除菜单信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/MessageService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\MessageModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\RedisService;
 
@@ -278,5 +279,16 @@ class MessageService extends BaseService
         return $result;
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除消息信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 
 }

app/Services/Common/NoticeService.php

@@ -14,6 +14,7 @@ namespace App\Services\Common;
 use App\Models\NoticeModel;
 use App\Services\BaseService;
 use App\Services\RedisService;
+use App\Models\ActionLogModel;
 
 /**
  * 通知公告-服务类
@@ -153,6 +154,9 @@ class NoticeService extends BaseService
 
     public function delete()
     {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除通知公告信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
         RedisService::clear("caches:index:notices");
         return parent::delete(); // TODO: Change the autogenerated stub
     }

app/Services/Common/RoleMenuService.php

@@ -11,6 +11,7 @@
 
 namespace App\Services\Common;
 
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -23,4 +24,16 @@ use App\Services\BaseService;
 class RoleMenuService extends BaseService
 {
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除角色菜单关系信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/RoleService.php

@@ -14,6 +14,7 @@ namespace App\Services\Common;
 use App\Models\MenuModel;
 use App\Models\RoleMenuModel;
 use App\Models\RoleModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -126,4 +127,16 @@ class RoleService extends BaseService
         return message();
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除角色信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/UploadService.php

@@ -11,6 +11,7 @@
 
 namespace App\Services\Common;
 
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\File;
 
@@ -55,4 +56,16 @@ class UploadService extends BaseService
         $rowId = $this->model->edit($data, $error, false);
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除上传文件信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/UserRoleService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\UserRoleModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -89,4 +90,16 @@ class UserRoleService extends BaseService
         }
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除用户角色关系信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/UserService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\UserModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\ConfigService;
 
@@ -252,4 +253,16 @@ class UserService extends BaseService
         return message("重置密码成功");
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除用户信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Common/VideoCategoryService.php

@@ -12,6 +12,7 @@
 namespace App\Services\Common;
 
 use App\Models\VideoCategoryModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\DB;
 
@@ -133,5 +134,16 @@ class VideoCategoryService extends BaseService
         return $datas ? $datas->toArray() : [];
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除视频分类信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 
 }

app/Services/Common/VideoService.php

@@ -2,6 +2,7 @@
 namespace App\Services\Common;
 
 use App\Models\VideoModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use App\Services\RedisService;
 use Illuminate\Support\Facades\DB;
@@ -184,4 +185,16 @@ class VideoService extends BaseService
 
         return $datas;
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除视频信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/VideosCoursesService.php

@@ -3,6 +3,7 @@ namespace App\Services\Common;
 
 use App\Models\VideoCoursesModel;
 use App\Models\VideosCoursesModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\DB;
 
@@ -157,4 +158,16 @@ class VideosCoursesService extends BaseService
         $info['poster'] = $info['poster'] ? get_image_url($info['poster']) : '';
         return message(MESSAGE_OK, true, $info);
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除视频课程信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Common/VipService.php

@@ -2,6 +2,7 @@
 namespace App\Services\Common;
 
 use App\Models\VipModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -243,4 +244,16 @@ class VipService extends BaseService
         }
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除VIP套餐信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Exam/PaperService.php

@@ -3,6 +3,7 @@ namespace App\Services\Exam;
 
 use App\Models\ExamPaperModel;
 use App\Models\ExamTopicModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\DB;
 
@@ -30,7 +31,7 @@ class PaperService extends BaseService
 
     public function customList($params, $pageSize = 15)
     {
-        $query = $this->model->where('mark', operator: 1);
+        $query = $this->model->where('mark',  1);
 
         if (!empty($params['scene_type'])) {
             $query->where('scene_type', $params['scene_type']);
@@ -116,4 +117,16 @@ class PaperService extends BaseService
         }
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除试卷信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }

app/Services/Exam/SubjectService.php

@@ -2,6 +2,7 @@
 namespace App\Services\Exam;
 
 use App\Models\ExamSubjectsModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 
 /**
@@ -116,4 +117,16 @@ class SubjectService extends BaseService
 
         return $datas ? $datas->toArray() : [];
     }
+
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除科目信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
 }

app/Services/Exam/TopicService.php

@@ -3,6 +3,7 @@ namespace App\Services\Exam;
 
 use App\Models\ExamTopic;
 use App\Models\ExamTopicModel;
+use App\Models\ActionLogModel;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\DB;
 
@@ -172,4 +173,16 @@ class TopicService extends BaseService
         return parent::edit($data); // 调用父类的 edit 方法
     }
 
+    /**
+     * 删除七天之前标记软删除的数据
+     */
+    public function delete()
+    {
+        // 设置日志标题
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "删除题目信息", 'content' => json_encode(request()->post(), 256), 'module' => 'admin']);
+        ActionLogModel::record();
+        $this->model->where('mark', 0)->where('update_time', '<=', time() - 7 * 86400)->delete();
+        return parent::delete();
+    }
+
 }