From e2b0e215d7f208a8f40aadb5ff05cd0f3088f0d9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 15 十二月 2023 09:09:35 +0800 Subject: [PATCH] 海康接口对接开发 --- server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 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..a3000e6 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,9 +70,9 @@ @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") -- Gitblit v1.9.3