From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 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..1cb579b 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
@@ -4,12 +4,15 @@
 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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+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.CarUseBook;
+import com.doumee.dao.business.vo.DateIntervalVO;
 import com.doumee.service.business.CarUseBookService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +21,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author 姹熻箘韫�
@@ -35,9 +39,12 @@
     @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());
+        if(Objects.isNull(loginUserInfo.getMemberId())){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
+        }
         carUseBook.setMemberId(loginUserInfo.getMemberId());
         return ApiResponse.success(carUseBookService.create(carUseBook));
     }
@@ -46,7 +53,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:carusebook:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        carUseBookService.deleteById(id);
+        carUseBookService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -70,6 +77,7 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:carusebook:query")
     public ApiResponse<PageData<CarUseBook>> findPage (@RequestBody PageWrap<CarUseBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carUseBookService.findPage(pageWrap));
     }
 
@@ -77,6 +85,8 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:carusebook:exportExcel")
     public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+        pageWrap.setCapacity(9999);
         ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response);
     }
 
@@ -84,14 +94,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