From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index a6653c3..e4f472b 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -6,11 +6,12 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.service.business.DeviceEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -20,7 +21,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
@RestController
@@ -33,7 +34,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:deviceevent:create")
+// @RequiresPermissions("business:deviceevent:create")
public ApiResponse create(@RequestBody DeviceEvent deviceEvent) {
return ApiResponse.success(deviceEventService.create(deviceEvent));
}
@@ -69,14 +70,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:deviceevent:query")
- public ApiResponse<PageData<DeviceEvent>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
- return ApiResponse.success(deviceEventService.findPage(pageWrap));
+ //@RequiresPermissions("business:deviceevent:query")
+ public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
+ return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:deviceevent:exportExcel")
+ //@RequiresPermissions("business:deviceevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
ExcelExporter.build(DeviceEvent.class).export(deviceEventService.findPage(pageWrap).getRecords(), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response);
}
--
Gitblit v1.9.3