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

weimingfei

4 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

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

@@ -4,9 +4,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.vo.RetentionCarsVO;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.RetentionService;
@@ -73,7 +74,19 @@
    public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
    }
    @ApiOperation("分页查询在场车辆")
    @PostMapping("/pageCars")
    @CloudRequiredPermission("business:retention:query")
    public ApiResponse<PageData<RetentionCarsVO>> findPageForCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(retentionService.findPageForCars(pageWrap));
    }

    @ApiOperation("导出车辆Excel")
    @PostMapping("/exportExcelCars")
    @CloudRequiredPermission("business:retention:exportExcel")
    public void exportExcelCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(RetentionCarsVO.class).export(retentionService.findPageForCars(pageWrap).getRecords(), "实时在场车辆", response);
    }
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:retention:exportExcel")