Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java

@@ -5,7 +5,10 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.service.business.InoutRecordService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
@@ -79,7 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:inoutrecord:exportExcel")
    public void exportExcel (@RequestBody PageWrap<InoutRecord> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(InoutRecord.class).export(inoutRecordService.findPage(pageWrap).getRecords(), "出入场人次车次每日统计表", response);
        ExcelExporter.build(InoutRecord.class).export(inoutRecordService.findPage(pageWrap).getRecords(), "出入场人次车次统计表_"+System.currentTimeMillis(), response);
    }

    @ApiOperation("根据ID查询")
@@ -88,4 +91,40 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(inoutRecordService.findById(id));
    }

    @ApiOperation("基础数据")
    @PostMapping("/getInParkUserData")
//    @CloudRequiredPermission("business:inoutrecord:query")
    public ApiResponse<InParkUserDataVO> getInParkUserData (@RequestBody InParkDataDTO inParkDataDTO) {
        return ApiResponse.success(inoutRecordService.getInParkUserData(inParkDataDTO));
    }


    @ApiOperation("占比数据")
    @PostMapping("/getRataList")
//    @CloudRequiredPermission("business:inoutrecord:query")
    public ApiResponse<List<GeneralDataVO>> getRataList (@RequestBody InParkDataDTO inParkDataDTO) {
        return ApiResponse.success(inoutRecordService.getRataList(inParkDataDTO));
    }


    @ApiOperation("报表数据")
    @PostMapping("/getReportList")
//    @CloudRequiredPermission("business:inoutrecord:query")
    public ApiResponse<List<List<String>>> getReportList (@RequestBody InParkDataDTO inParkDataDTO) {
        return ApiResponse.success(inoutRecordService.getReportList(inParkDataDTO));
    }



    @ApiOperation("入园数据分析-导出Excel")
    @PostMapping("/reportExportExcel")
//    @CloudRequiredPermission("business:inoutrecord:query")
    public void reportExportExcel (@RequestBody InParkDataDTO inParkDataDTO, HttpServletResponse response) {
        inoutRecordService.excel(inParkDataDTO,response);
    }




}