From 04cc023b4f8186fe7e3f5d3bbf311529dc81a378 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Tue, 31 Mar 2026 08:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=A7=E5=B1=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=96=E6=B6=88=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfiguration.java | 35 +++++++++++++++++++ .../admin/device/DeviceController.java | 2 +- .../DeviceOperationRecordController.java | 2 +- .../DeviceWarinningRecordController.java | 4 +-- .../admin/dashboard/DashboardController.java | 4 +-- .../energydevice/EnergyDeviceController.java | 4 +-- .../controller/admin/plan/PlanController.java | 2 +- 7 files changed, 44 insertions(+), 9 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java index 8d3040845..932fbe879 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java @@ -23,6 +23,7 @@ public class SecurityConfiguration { @Override public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { // Swagger 接口文档 + String aa=""; registry.requestMatchers("/v3/api-docs/**").permitAll() .requestMatchers("/webjars/**").permitAll() .requestMatchers("/swagger-ui.html").permitAll() @@ -37,6 +38,40 @@ public class SecurityConfiguration { .requestMatchers(adminSeverContextPath + "/**").permitAll(); // 文件读取 registry.requestMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); + //大屏跳转 + registry.requestMatchers(buildAdminApi("/mes/plan/getProductPlans")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/plan/getPlanCapacity")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/plan/getWeekTrend")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/plan/getLastSevenDaysCompletedCount")).permitAll(); + + registry.requestMatchers(buildAdminApi("/iot/device-operation-record/deviceOperationList")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/plan/getLastDaysRate")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/energy-type/list")).permitAll(); + + + registry.requestMatchers(buildAdminApi("/mes/energy-device/latestSevenDaysStatistics")).permitAll(); + + registry.requestMatchers(buildAdminApi("/iot/device/getDeviceOperationalStatus")).permitAll(); + + registry.requestMatchers(buildAdminApi("/iot/device-warinning-record/getLastSevenHoursCount")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/dashboard/getTaskStatistics")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/dashboard/getAllTaskList")).permitAll(); + + registry.requestMatchers(buildAdminApi("/iot/device/device-attribute/batchList")).permitAll(); + + registry.requestMatchers(buildAdminApi("/mes/energy-device/lastEnergyStatistics")).permitAll(); + + registry.requestMatchers(buildAdminApi("/iot/device-warinning-record/getList")).permitAll(); + + + } }; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index d39154dad..878135f00 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -323,7 +323,7 @@ public class DeviceController { @GetMapping("/device-attribute/batchList") @Operation(summary = "获得多个设备的属性数据") @Parameter(name = "goviewId", description = "大屏ID", required = true) - @PreAuthorize("@ss.hasPermission('iot:device:query')") + //@PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult>> getMultiDeviceAttributes(@RequestParam("goviewId") Long goviewId) { return success(deviceService.getMultiDeviceAttributes(goviewId)); } 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 c622af662..16b4178d5 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 @@ -106,7 +106,7 @@ public class DeviceOperationRecordController { @GetMapping("/deviceOperationList") @Operation(summary = "产线设备运行开机率/稼动率-大屏") - @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") public CommonResult> deviceOperationList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) { List deviceTotalTimeRecordRespVOList = deviceOperationRecordService.deviceOperationList(pageReqVO); return success(deviceTotalTimeRecordRespVOList); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java index 8ff481ae2..767869a75 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java @@ -97,7 +97,7 @@ public class DeviceWarinningRecordController { @Operation(summary = "获得告警记录列表") @Parameter(name = "deviceId", description = "设备Id", required = true, example = "1024") @Parameter(name = "orgId", description = "产线组织Id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") + //@PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") public CommonResult> getList(@RequestParam(name = "deviceId" ,required = false) Long id, @RequestParam(name = "orgId" ,required = false) Long orgId) { List deviceWarinningRecord = deviceWarinningRecordService.getList(id); @@ -108,7 +108,7 @@ public class DeviceWarinningRecordController { @GetMapping("/getLastSevenHoursCount") @Operation(summary = "获取过去7小时每小时告警数量") @Parameter(name = "orgId", description = "产线组织Id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") + //@PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") public CommonResult>> getLastSevenHoursCount( @RequestParam(name = "orgId" ,required = false) Long orgId) { List> hourCounts = deviceWarinningRecordService.getLastSevenHoursCount(); return success(hourCounts); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java index 209ee261b..b20bf55d2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java @@ -497,7 +497,7 @@ public class DashboardController { @GetMapping("/getTaskStatistics") @Operation(summary = "获得各设备统计个数") @Parameter(name = "orgId", description = "产线组织Id") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + //@PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult getTaskStatistics(@RequestParam(name = "orgId") Long orgId) { EventStatisticsVO vo = new EventStatisticsVO(); @@ -559,7 +559,7 @@ public class DashboardController { @GetMapping("/getAllTaskList") @Operation(summary = "获得所有任务") @Parameter(name = "orgId", description = "产线组织Id") - @PreAuthorize("@ss.hasPermission('mes:bom:query')") + //@PreAuthorize("@ss.hasPermission('mes:bom:query')") public CommonResult> getAllTaskList(@RequestParam(name = "orgId") Long orgId) { List taskVOList = new ArrayList<>(); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java index 00e48dbe9..fdba623c3 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java @@ -167,7 +167,7 @@ public class EnergyDeviceController { @GetMapping("/lastEnergyStatistics") @Operation(summary = "获得近七小时能耗记录") - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + //@PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> lastEnergyStatistics(@RequestParam("deviceTypeId") Long deviceTypeId, @RequestParam("orgId") Long orgId) { @@ -178,7 +178,7 @@ public class EnergyDeviceController { @GetMapping("/latestSevenDaysStatistics") @Operation(summary = "获得近七天能耗记录") - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> latestSevenDaysStatistics( @RequestParam Long deviceTypeId, @RequestParam Long orgId) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java index 76d8055c2..2a5579823 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java @@ -579,7 +579,7 @@ public class PlanController { @GetMapping("/getLastSevenDaysCompletedCount") @Operation(summary = "获取过去7天每天完工数量统计") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + //@PreAuthorize("@ss.hasPermission('mes:plan:query')") @Parameter(name = "orgId", description = "产线组织Id", required = true, example = "1024") public CommonResult>> getLastSevenDaysCompletedCount( @RequestParam(name = "orgId" ,required = false) Long orgId) { List> dayCounts = planService.getLastSevenDaysCompletedCount();