Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-07 7a9f9f26ed90c33190382645d0851490ce94424b

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

@@ -6,7 +6,9 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.system.vo.DeviceEventVo;
import com.doumee.service.business.DeviceEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,17 +71,20 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:deviceevent:query")
    public ApiResponse<PageData<DeviceEvent>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
        return ApiResponse.success(deviceEventService.findPage(pageWrap));
    //@RequiresPermissions("business:deviceevent:query")
    public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
        return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:deviceevent:exportExcel")
    //@RequiresPermissions("business:deviceevent:exportExcel")
    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(DeviceEvent.class).export(deviceEventService.findPage(pageWrap).getRecords(), "门禁事件推送记录表", response);
        ExcelExporter.build(DeviceEventDTO.class).export(deviceEventService.findDeviceEventDTOPage(pageWrap).getRecords(), "门禁事件推送记录表", response);
    }
//    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
//        ExcelExporter.build(DeviceEventVo.class).export(deviceEventService.findDeviceEventExcel(pageWrap), "门禁事件推送记录表", response);
//    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")