diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java index 321c6f9e8..320e3a05c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java @@ -39,12 +39,20 @@ public class TenantSecurityWebFilter extends ApiRequestFilter { private static final String INNER_PROFILE = "inner"; private static final List INNER_IGNORE_URLS = Arrays.asList( "/admin-api/iot/device-operation-record/runOverview", + "/admin-api/iot/device-operation-record/deviceOperationList", + "/admin-api/iot/device-warinning-record/getList", "/admin-api/iot/device/page", "/admin-api/mes/organization/list", + "/admin-api/mes/plan/getProductPlans", + "/admin-api/mes/plan/getPlanCapacity", + "/admin-api/mes/plan/getWeekTrend", + "/admin-api/mes/plan/getLastSevenDaysCompletedCount", + "/admin-api/mes/plan/getLastDaysRate", "/admin-api/mes/device-line/deviceParameterAnalysis", "/admin-api/mes/device-ledger/list", "/admin-api/mes/energy-type/list", "/admin-api/mes/energy-device/getList", + "/admin-api/mes/energy-device/latestSevenDaysStatistics", "/admin-api/mes/energy-device/queryOverviewData", "/admin-api/system/dict-data/simple-list", "/admin-api/erp/warehouse/simple-list", diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java index 54c474f4d..845a24e97 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java @@ -55,12 +55,20 @@ public class YudaoWebSecurityConfigurerAdapter { private static final String HOME_INFO_PERMIT_ALL_URL = "/admin-api/home/info/**"; private static final List RUN_OVERVIEW_PERMIT_ALL_URLS = Arrays.asList( "/admin-api/iot/device-operation-record/runOverview", + "/admin-api/iot/device-operation-record/deviceOperationList", + "/admin-api/iot/device-warinning-record/getList", "/admin-api/iot/device/page", "/admin-api/mes/organization/list", + "/admin-api/mes/plan/getProductPlans", + "/admin-api/mes/plan/getPlanCapacity", + "/admin-api/mes/plan/getWeekTrend", + "/admin-api/mes/plan/getLastSevenDaysCompletedCount", + "/admin-api/mes/plan/getLastDaysRate", "/admin-api/mes/device-line/deviceParameterAnalysis", "/admin-api/mes/device-ledger/list", "/admin-api/mes/energy-type/list", "/admin-api/mes/energy-device/getList", + "/admin-api/mes/energy-device/latestSevenDaysStatistics", "/admin-api/mes/energy-device/queryOverviewData", "/admin-api/system/dict-data/simple-list", "/admin-api/erp/warehouse/simple-list", diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java index 32e8427fe..4848bb4e8 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java @@ -129,7 +129,7 @@ public class DeviceOperationRecordController { @GetMapping("/deviceOperationList") @Operation(summary = "产线设备运行开机率/利用率大屏") - @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") + @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device-operation-record:query')") public CommonResult> deviceOperationList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) { return success(deviceOperationRecordService.deviceOperationList(pageReqVO)); }