From 42f57295f5fe64132c11a25f55cd25c3c8acf167 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 28 八月 2024 15:35:55 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java index 5be5d78..881133f 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java @@ -10,6 +10,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.CarUseBook; +import com.doumee.dao.business.vo.DateIntervalVO; import com.doumee.service.business.CarUseBookService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,7 +36,7 @@ @ApiOperation("鏂板缓") @PostMapping("/create") @CloudRequiredPermission("business:carusebook:create") - public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) throws Exception { LoginUserInfo loginUserInfo = getLoginUser(token); carUseBook.setCreator(loginUserInfo.getId()); carUseBook.setMemberId(loginUserInfo.getMemberId()); @@ -84,14 +85,26 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:carusebook:query") public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - return ApiResponse.success(carUseBookService.findById(id)); + return ApiResponse.success(carUseBookService.findById(id,getLoginUser(token).getMemberId())); } @ApiOperation("鏌ヨ杞﹁締棰勭害璁板綍") @PostMapping("/carUseBookList") - public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) throws Exception { return ApiResponse.success(carUseBookService.carUseBookList(carUseBook)); } + @ApiOperation("鏌ヨ杞﹁締鍙绾︽椂娈�") + @GetMapping("/carCanReservationDate") + public ApiResponse<List<DateIntervalVO>> carCanReservationDate (@RequestParam Integer carId, @RequestParam String dateDay, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + return ApiResponse.success(carUseBookService.checkDateUse(carId,dateDay)); + } + + @ApiOperation("鐢宠鎾ら攢") + @GetMapping("/revoke") + public ApiResponse revoke (@RequestParam Integer id,String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + carUseBookService.revoke(id,info,getLoginUser(token)); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } } -- Gitblit v1.9.3