From a254510ced8108c0cde37eb31a6b3e6469fcb2fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 13:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index 3b4975a..fd69d04 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "璁惧淇℃伅琛�")
@RestController
@@ -69,14 +69,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:device:query")
+ //@RequiresPermissions("business:device:query")
public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap) {
return ApiResponse.success(deviceService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:device:exportExcel")
+ //@RequiresPermissions("business:device:exportExcel")
public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Device.class).export(deviceService.findPage(pageWrap).getRecords(), "璁惧淇℃伅琛�", response);
}
@@ -87,4 +87,11 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(deviceService.findById(id));
}
+
+ @ApiOperation("鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍")
+ @PostMapping("/getList")
+ //@RequiresPermissions("business:device:query")
+ public ApiResponse findList(@RequestBody Device device) {
+ return ApiResponse.success(deviceService.findIdAndNameList(device));
+ }
}
--
Gitblit v1.9.3