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/DeviceCloudController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceCloudController.java
index 076c928..3484d27 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceCloudController.java
@@ -35,21 +35,21 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:device:create")
- public ApiResponse create(@RequestBody Device device) {
+ public ApiResponse create(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(deviceService.create(device));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:device:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
deviceService.deleteById(id);
return ApiResponse.success(null);
}
@ApiOperation("淇敼鏄惁闂ㄧ鍏ュ彛")
@PostMapping("/updateEntranceById")
@CloudRequiredPermission("business:company:update")
- public ApiResponse updateStatusById(@RequestBody Device param) {
+ public ApiResponse updateStatusById(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
Device d = new Device();
d.setId(param.getId());
d.setEditDate(new Date());
@@ -61,7 +61,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:device: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) {
@@ -74,7 +74,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:device:update")
- public ApiResponse updateById(@RequestBody Device device) {
+ public ApiResponse updateById(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
deviceService.updateById(device);
return ApiResponse.success(null);
}
@@ -82,28 +82,28 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:device:query")
- public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap) {
+ public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(deviceService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:device:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Device.class).export(deviceService.findPage(pageWrap).getRecords(), "璁惧淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:device:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(deviceService.findById(id));
}
@ApiOperation("鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍")
@PostMapping("/getList")
@CloudRequiredPermission("business:device:query")
- public ApiResponse findList(@RequestBody Device device) {
+ public ApiResponse findList(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(deviceService.findIdAndNameList(device));
}
}
--
Gitblit v1.9.3