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

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java

@@ -1,19 +1,19 @@
package com.ard.route.service.impl;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.ArdRouteFile;
import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.mapper.ArdRouteFileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFolderMapper;
import com.ard.route.domain.ArdRouteFolder;
import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
import org.springframework.transaction.annotation.Transactional;

@@ -80,6 +80,9 @@
    public int insertArdRouteFolder(ArdRouteFolder ardRouteFolder) {
        ardRouteFolder.setId(IdUtils.simpleUUID());
        ardRouteFolder.setCreateTime(DateUtils.getNowDate());
        // 获取当前数据条数
        int count = ardRouteFolderMapper.selectArdRouteFolderList(null).size();
        ardRouteFolder.setSerialNumber(count + 1);
        return ardRouteFolderMapper.insertArdRouteFolder(ardRouteFolder);
    }

@@ -91,6 +94,10 @@
     */
    @Override
    public int updateArdRouteFolder(ArdRouteFolder ardRouteFolder) {
        // 不能修改默认文件夹
        if ("0".equals(ardRouteFolder.getId())) {
            throw new RuntimeException("不能修改默认文件夹");
        }
        ardRouteFolder.setUpdateTime(DateUtils.getNowDate());
        return ardRouteFolderMapper.updateArdRouteFolder(ardRouteFolder);
    }
@@ -104,17 +111,27 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
        Map<String, Integer> result = new HashMap<>();
        int fileAdd = 0;
        // 删除文件夹的同时也删除文件夹下的所有文件
        for (String folderId : ids) {
            ardRouteFileMapper.deleteArdRouteFileByFolderId(folderId);
            fileAdd ++;
        // 检查是否包含默认文件夹，不能删除默认文件夹
        for (String id : ids) {
            if ("0".equals(id)) {
                throw new RuntimeException("不能删除默认文件夹");
            }
        }
        result.put("file", fileAdd);
        int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
        result.put("folder", folderCount);
        return result;

        Map<String, Integer> result = new HashMap<>();
        try {
            // 先删除文件
            int fileCount = ardRouteFileMapper.deleteRouteFileByFolderIds(ids);
            result.put("file", fileCount);

            // 再删除文件夹
            int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
            result.put("folder", folderCount);

            return result;
        } catch (Exception e) {
            throw e; // 抛出异常让事务回滚
        }
    }

    /**