From 22a00c47589ded6699a563690ee5545b73eaca01 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 22 十二月 2023 09:30:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java index 4fa9842..3d60a5e 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java @@ -1,22 +1,19 @@ package com.doumee.api.business; -import com.alibaba.fastjson.JSON; import com.doumee.api.BaseController; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.Problems; import com.doumee.service.business.ProblemsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -42,7 +39,7 @@ @ApiOperation("鏍规嵁ID鍒犻櫎") @GetMapping("/delete/{id}") - @RequiresPermissions("business:problems:delete") + //@RequiresPermissions("business:problems:delete") public ApiResponse deleteById(@PathVariable Integer id) { problemsService.deleteById(id); return ApiResponse.success(null); @@ -50,7 +47,7 @@ @ApiOperation("鎵归噺鍒犻櫎") @GetMapping("/delete/batch") - @RequiresPermissions("business:problems:delete") + //@RequiresPermissions("business:problems:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { String [] idArray = ids.split(","); List<Integer> idList = new ArrayList<>(); @@ -71,14 +68,14 @@ @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") - @RequiresPermissions("business:problems:query") + //@RequiresPermissions("business:problems:query") public ApiResponse<PageData<Problems>> findPage (@RequestBody PageWrap<Problems> pageWrap) { return ApiResponse.success(problemsService.findPage(pageWrap)); } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") - @RequiresPermissions("business:problems:exportExcel") + //@RequiresPermissions("business:problems:exportExcel") public void exportExcel (@RequestBody PageWrap<Problems> pageWrap, HttpServletResponse response) { ExcelExporter.build(Problems.class).export(problemsService.findPage(pageWrap).getRecords(), "璇曢淇℃伅琛�", response); } -- Gitblit v1.9.3