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

yanderong

2026-10-02 bca4733e4b0fcd9b6496e608304549a09f982463

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserWhitelistController.java

@@ -2,9 +2,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.AppUserWhitelistAllocateDTO;
import com.ruoyi.account.api.dto.AppUserWhitelistExcelDTO;
import com.ruoyi.account.api.dto.AppUserWhitelistImportDTO;
import com.ruoyi.account.api.dto.AppUserWhitelistQueryDTO;
import com.ruoyi.account.api.dto.AppUserWhitelistSaveDTO;
import com.ruoyi.account.api.dto.AppUserWhitelistStatusDTO;
import com.ruoyi.account.api.model.TAppUserWhitelist;
import com.ruoyi.account.api.vo.AppUserWhitelistAllocateVO;
import com.ruoyi.account.api.vo.AppUserWhitelistMatchVO;
@@ -120,6 +122,14 @@
        return R.ok(whitelistService.unbindFleet(ids));
    }

    @ApiOperation("启用或停用白名单用户")
    @RequiresPermissions(value = {"/appUserWhitelist/status"}, logical = Logical.OR)
    @Log(title = "【白名单用户】启用或停用", businessType = BusinessType.UPDATE, operatorType = OperatorType.MANAGE)
    @PutMapping("/status")
    public R<Boolean> status(@RequestBody AppUserWhitelistStatusDTO statusDTO) {
        return R.ok(whitelistService.updateStatus(statusDTO));
    }

    @ApiOperation("额度分配概览（公司总账户余额、可分配余额）")
    @RequiresPermissions(value = {"/appUserWhitelist/allocate"}, logical = Logical.OR)
    @GetMapping("/allocate-overview")
@@ -135,6 +145,14 @@
        return R.ok(whitelistService.allocateQuota(allocateDTO));
    }

    @ApiOperation("导出白名单用户列表")
    @RequiresPermissions(value = {"/appUserWhitelist/export"}, logical = Logical.OR)
    @PutMapping("/export")
    public void export(HttpServletResponse response, @RequestBody(required = false) AppUserWhitelistQueryDTO queryDTO) {
        ExcelUtil<AppUserWhitelistExcelDTO> util = new ExcelUtil<>(AppUserWhitelistExcelDTO.class);
        util.exportExcel(response, whitelistService.selectExportList(queryDTO), "白名单用户数据");
    }

    @ApiOperation("下载白名单用户导入模板")
    @RequiresPermissions(value = {"/appUserWhitelist/import"}, logical = Logical.OR)
    @GetMapping("/importTemplate")