Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

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

@@ -6,6 +6,7 @@
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.service.business.VisitEventService;
import io.swagger.annotations.Api;
@@ -69,14 +70,14 @@

    @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);
    }