From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 06 三月 2025 16:01:45 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java index e287f9d..9d62b11 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java @@ -4,9 +4,9 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.DeviceRole; import com.doumee.service.business.DeviceRoleService; @@ -93,6 +93,12 @@ public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ return ApiResponse.success(deviceRoleService.findPage(pageWrap)); } + @ApiOperation("鏌ヨ鍏ㄩ儴") + @PostMapping("/list") + @CloudRequiredPermission("business:devicerole:query") + public ApiResponse<List<DeviceRole>> findList (@RequestBody DeviceRole pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + return ApiResponse.success(deviceRoleService.findList(pageWrap)); + } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") -- Gitblit v1.9.3