Merge remote-tracking branch 'origin/master'

refactor(video): 移除设备和巡检任务接口权限注解并调整模型控制器包结构
- 移除了 DeviceController 中所有方法的 @PreAuthorize 权限注解 - 移除了 InspectionTaskController 中所有方法的 @PreAuthorize 权限注解 - 将 ModelController 从 ruoyi-admin 模块迁移至 ruoyi-video 模块- 调整 ModelController 包路径并继承 BaseController-为 ModelController 的各个接口添加了相应的权限注解- 修改 list 方法返回类型为 TableDataInfo 并支持分页查询- 引入缺失的类依赖和安全注解支持
2025-09-29 11:24:42 +08:00 · 2025-09-29 11:22:53 +08:00
3 changed files with 17 additions and 22 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/video/DeviceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/video/DeviceController.java
@@ -37,7 +37,6 @@ public class DeviceController extends BaseController {
    /**
     * 查询设备列表
     */
-    @PreAuthorize("@ss.hasPermi('video:device:list')")
    @GetMapping("/list")
    public TableDataInfo list(Device device) {
        startPage();
@@ -48,7 +47,6 @@ public class DeviceController extends BaseController {
    /**
     * 导出设备列表
     */
-    @PreAuthorize("@ss.hasPermi('video:device:export')")
    @Log(title = "设备", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, Device device) {
@@ -60,7 +58,6 @@ public class DeviceController extends BaseController {
    /**
     * 获取设备详细信息
     */
-    @PreAuthorize("@ss.hasPermi('video:device:query')")
    @GetMapping(value = "/{deviceId}")
    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId) {
        return success(deviceService.selectDeviceByDeviceId(deviceId));
@@ -69,7 +66,6 @@ public class DeviceController extends BaseController {
    /**
     * 新增设备
     */
-    @PreAuthorize("@ss.hasPermi('video:device:add')")
    @Log(title = "设备", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody Device device) {
@@ -79,7 +75,6 @@ public class DeviceController extends BaseController {
    /**
     * 修改设备
     */
-    @PreAuthorize("@ss.hasPermi('video:device:edit')")
    @Log(title = "设备", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody Device device) {
@@ -89,7 +84,6 @@ public class DeviceController extends BaseController {
    /**
     * 删除设备
     */
-    @PreAuthorize("@ss.hasPermi('video:device:remove')")
    @Log(title = "设备", businessType = BusinessType.DELETE)
    @DeleteMapping("/{deviceIds}")
    public AjaxResult remove(@PathVariable Long[] deviceIds) {
--- a/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskController.java
+++ b/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskController.java
@@ -32,7 +32,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 查询巡检任务列表
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:list')")
    @GetMapping("/list")
    public TableDataInfo list(InspectionTask inspectionTask) {
        startPage();
@@ -43,7 +42,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 导出巡检任务列表
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:export')")
    @Log(title = "巡检任务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, InspectionTask inspectionTask) {
@@ -55,7 +53,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 获取巡检任务详细信息
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:query')")
    @GetMapping(value = "/{taskId}")
    public AjaxResult getInfo(@PathVariable("taskId") Long taskId) {
        return success(inspectionTaskService.selectInspectionTaskById(taskId));
@@ -64,7 +61,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 新增巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:add')")
    @Log(title = "巡检任务", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody InspectionTask inspectionTask) {
@@ -74,7 +70,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 修改巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:edit')")
    @Log(title = "巡检任务", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody InspectionTask inspectionTask) {
@@ -84,7 +79,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 删除巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:remove')")
    @Log(title = "巡检任务", businessType = BusinessType.DELETE)
    @DeleteMapping("/{taskIds}")
    public AjaxResult remove(@PathVariable Long[] taskIds) {
@@ -94,7 +88,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 启动巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:start')")
    @Log(title = "启动巡检任务", businessType = BusinessType.UPDATE)
    @PostMapping("/start/{taskId}")
    public AjaxResult start(@PathVariable Long taskId) {
@@ -105,7 +98,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 停止巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:stop')")
    @Log(title = "停止巡检任务", businessType = BusinessType.UPDATE)
    @PostMapping("/stop/{taskId}")
    public AjaxResult stop(@PathVariable Long taskId) {
@@ -116,7 +108,6 @@ public class InspectionTaskController extends BaseController {
    /**
     * 手动执行巡检任务
     */
-    @PreAuthorize("@ss.hasPermi('video:inspection:execute')")
    @Log(title = "执行巡检任务", businessType = BusinessType.UPDATE)
    @PostMapping("/execute/{taskId}")
    public AjaxResult execute(@PathVariable Long taskId) {
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/video/ModelController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/video/ModelController.java
@@ -1,10 +1,13 @@
-package com.ruoyi.web.controller.video;
+package com.ruoyi.video.controller;

+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.video.domain.VModel;
 import com.ruoyi.video.service.IVModelService;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.io.IOException;
@@ -16,7 +19,7 @@ import java.util.Map;

@RestController
@RequestMapping("/video/model")
-public class ModelController {
+public class ModelController extends BaseController {

    private final IVModelService modelService;

@@ -25,6 +28,7 @@ public class ModelController {
    }

    /** 新增模型（JSON） */
+    @PreAuthorize("@ss.hasPermi('video:model:add')")
    @PostMapping
    public AjaxResult create(@RequestBody VModel model) {
        if (StringUtils.isEmpty(model.getModelName())) {
@@ -41,6 +45,7 @@ public class ModelController {
    }

    /** 根据ID查询 */
+    @PreAuthorize("@ss.hasPermi('video:model:query')")
    @GetMapping("/{id}")
    public AjaxResult get(@PathVariable("id") Long id) {
        VModel model = modelService.selectById(id);
@@ -48,21 +53,24 @@ public class ModelController {
    }

    /** 列表查询（可选条件） */
+    @PreAuthorize("@ss.hasPermi('video:model:list')")
    @GetMapping("/list")
-    public AjaxResult list(@RequestParam(value = "modelName", required = false) String modelName,
-                           @RequestParam(value = "framework", required = false) String framework,
-                           @RequestParam(value = "enabled", required = false) Integer enabled,
-                           @RequestParam(value = "keyword", required = false) String keyword) {
+    public TableDataInfo list(@RequestParam(value = "modelName", required = false) String modelName,
+                              @RequestParam(value = "framework", required = false) String framework,
+                              @RequestParam(value = "enabled", required = false) Integer enabled,
+                              @RequestParam(value = "keyword", required = false) String keyword) {
+        startPage();
        Map<String, Object> params = new HashMap<>();
        params.put("modelName", modelName);
        params.put("framework", framework);
        params.put("enabled", enabled);
        params.put("keyword", keyword);
        List<VModel> list = modelService.selectList(params);
-        return AjaxResult.success(list);
+        return getDataTable(list);
    }

    /** 删除 */
+    @PreAuthorize("@ss.hasPermi('video:model:remove')")
    @DeleteMapping("/{id}")
    public AjaxResult delete(@PathVariable("id") Long id) {
        int rows = modelService.deleteById(id);
@@ -70,6 +78,7 @@ public class ModelController {
    }

    /** 启用/禁用 */
+    @PreAuthorize("@ss.hasPermi('video:model:edit')")
    @PutMapping("/{id}/enable")
    public AjaxResult enable(@PathVariable("id") Long id,
                             @RequestParam("enabled") Integer enabled) {
@@ -81,6 +90,7 @@ public class ModelController {
    }

    /** 下载：直接 302 重定向到模型URL，确保可点击下载 */
+    @PreAuthorize("@ss.hasPermi('video:model:download')")
    @GetMapping("/download/{id}")
    public void download(@PathVariable("id") Long id, HttpServletResponse response) throws IOException {
        VModel model = modelService.selectById(id);