From c75257907b5f0d31135236b7c4494aa20e2d7973 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 26 二月 2024 15:56:33 +0800 Subject: [PATCH] 整理 --- server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java index e4f2e72..e65e0b2 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java @@ -6,11 +6,13 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.dao.admin.response.VisitEventDTO; import com.doumee.dao.business.model.VisitEvent; +import com.doumee.dao.system.vo.VisitEventVo; import com.doumee.service.business.VisitEventService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; +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; @@ -69,16 +71,16 @@ @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") - @RequiresPermissions("business:visitevent:query") - public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) { - return ApiResponse.success(visitEventService.findPage(pageWrap)); + //@RequiresPermissions("business:visitevent:query") + public ApiResponse<PageData<VisitEventDTO>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) { + return ApiResponse.success(visitEventService.findVisitPage(pageWrap)); } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") - @RequiresPermissions("business:visitevent:exportExcel") + //@RequiresPermissions("business:visitevent:exportExcel") public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) { - ExcelExporter.build(VisitEvent.class).export(visitEventService.findPage(pageWrap).getRecords(), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response); + ExcelExporter.build(VisitEventVo.class).export(visitEventService.findPageExcel(pageWrap), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3