From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CarEventCloudController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CarEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CarEventCloudController.java
index ed34a40..c8aadba 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CarEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CarEventCloudController.java
@@ -40,14 +40,14 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
// @CloudRequiredPermission("business:carevent:create")
- public ApiResponse create(@RequestBody CarEvent carEvent) {
+ public ApiResponse create(@RequestBody CarEvent carEvent,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(carEventService.create(carEvent));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:carevent:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
carEventService.deleteById(id);
return ApiResponse.success(null);
}
@@ -55,7 +55,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:carevent:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -68,7 +68,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:carevent:update")
- public ApiResponse updateById(@RequestBody CarEvent carEvent) {
+ public ApiResponse updateById(@RequestBody CarEvent carEvent,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
carEventService.updateById(carEvent);
return ApiResponse.success(null);
}
@@ -76,28 +76,28 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
//@CloudRequiredPermission("business:carevent:query")
- public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) {
+ public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(carEventService.findVisitCarPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
//@CloudRequiredPermission("business:carevent:exportExcel")
- public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
// ExcelExporter.build(CarEventVo.class).exportWithFirstAndEnd (carEventService.findPageExcel(pageWrap),"鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", null, "鍋滆溅鍦轰簨浠舵帹閫佽褰曞鍑烘姤琛�",null , response);
ExcelExporter.build(CarEventDTO.class).export(carEventService.findVisitCarPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
}
@ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾杩囪溅鏁版嵁")
@PostMapping("/syncByDate")
@CloudRequiredPermission("business:carevent:sync")
- public ApiResponse syncByDate(@RequestBody CarEvent param) {
+ public ApiResponse syncByDate(@RequestBody CarEvent param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
hkSyncParkService.syncParkRecords(param.getCreateDate());
return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:carevent:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(carEventService.findById(id));
}
}
--
Gitblit v1.9.3