Merge remote-tracking branch 'origin/master'

jiangping

2024-03-04 a254510ced8108c0cde37eb31a6b3e6469fcb2fb

 server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java

@@ -40,7 +40,7 @@

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:devicerole:delete")
    //@RequiresPermissions("business:devicerole:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        deviceRoleService.deleteById(id);
        return ApiResponse.success(null);
@@ -48,7 +48,7 @@

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:devicerole:delete")
    //@RequiresPermissions("business:devicerole:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
@@ -77,14 +77,14 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:devicerole:query")
    //@RequiresPermissions("business:devicerole:query")
    public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap) {
        return ApiResponse.success(deviceRoleService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:devicerole:exportExcel")
    //@RequiresPermissions("business:devicerole:exportExcel")
    public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "门禁角色信息表", response);
    }