Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

 ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java

@@ -43,10 +43,10 @@
     * 查询文件夹列表
     */
    @ApiOperation("查询文件夹列表")
    @PreAuthorize("@ss.hasPermi('route:folder:list')")
    //@PreAuthorize("@ss.hasPermi('route:folder:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdRouteFolder ardRouteFolder) {
        startPage();
        //startPage();
        List<ArdRouteFolder> list = ardRouteFolderService.selectArdRouteFolderList(ardRouteFolder);
        return getDataTable(list);
    }
@@ -55,7 +55,7 @@
     * 导出文件夹列表
     */
    @ApiOperation("导出文件夹列表")
    @PreAuthorize("@ss.hasPermi('route:folder:export')")
    //@PreAuthorize("@ss.hasPermi('route:folder:export')")
    @Log(title = "文件夹", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdRouteFolder ardRouteFolder) {
@@ -68,7 +68,7 @@
     * 获取文件夹详细信息
     */
    @ApiOperation("获取文件夹详细信息")
    @PreAuthorize("@ss.hasPermi('route:folder:query')")
    //@PreAuthorize("@ss.hasPermi('route:folder:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(ardRouteFolderService.selectArdRouteFolderById(id));
@@ -78,7 +78,7 @@
     * 新增文件夹
     */
    @ApiOperation("新增文件夹")
    @PreAuthorize("@ss.hasPermi('route:folder:add')")
    //@PreAuthorize("@ss.hasPermi('route:folder:add')")
    @Log(title = "文件夹", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdRouteFolder ardRouteFolder) {
@@ -90,7 +90,7 @@
     * 修改文件夹
     */
    @ApiOperation("修改文件夹")
    @PreAuthorize("@ss.hasPermi('route:folder:edit')")
    //@PreAuthorize("@ss.hasPermi('route:folder:edit')")
    @Log(title = "文件夹", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdRouteFolder ardRouteFolder) {
@@ -102,7 +102,7 @@
     * 删除文件夹
     */
    @ApiOperation("删除文件夹")
    @PreAuthorize("@ss.hasPermi('route:folder:remove')")
    //@PreAuthorize("@ss.hasPermi('route:folder:remove')")
    @Log(title = "文件夹", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {