Merge remote-tracking branch 'origin/master'

jiangping

2024-10-21 d4be41ccac01b155c7a067c73f2045f9ea0aa805

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

@@ -5,10 +5,12 @@
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.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;
@@ -16,6 +18,8 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * @author 江蹄蹄
 * @since 2024/04/28 16:06
@@ -32,7 +36,10 @@
    @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());
        return ApiResponse.success(carUseBookService.create(carUseBook));
    }

@@ -78,6 +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)  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("操作成功");
    }

}