查询大屏接口取消拦截

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<HttpSecurity>.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();
+
+
+
             }
 
         };

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<List<Map<String, Object>>> getMultiDeviceAttributes(@RequestParam("goviewId") Long goviewId) {
         return success(deviceService.getMultiDeviceAttributes(goviewId));
     }

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<List<DeviceTotalTimeRecordRespVO>> deviceOperationList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) {
         List<DeviceTotalTimeRecordRespVO> deviceTotalTimeRecordRespVOList = deviceOperationRecordService.deviceOperationList(pageReqVO);
         return success(deviceTotalTimeRecordRespVOList);

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<List<DeviceWarinningRecordDO>> getList(@RequestParam(name = "deviceId" ,required = false) Long id,
                                                                @RequestParam(name = "orgId" ,required = false) Long orgId) {
         List<DeviceWarinningRecordDO> 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<List<Map<String, Object>>> getLastSevenHoursCount( @RequestParam(name = "orgId" ,required = false) Long orgId) {
         List<Map<String, Object>> hourCounts = deviceWarinningRecordService.getLastSevenHoursCount();
         return success(hourCounts);

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<EventStatisticsVO> 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<List<TaskVO>> getAllTaskList(@RequestParam(name = "orgId") Long orgId) {
         List<TaskVO> taskVOList = new ArrayList<>();
 

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<List<HourEnergyValueVO>> 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<List<DayEnergyValueVO>> latestSevenDaysStatistics(
                                     @RequestParam Long deviceTypeId,
                                     @RequestParam Long orgId) {

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<List<Map<String, Object>>> getLastSevenDaysCompletedCount( @RequestParam(name = "orgId" ,required = false) Long orgId) {
         List<Map<String, Object>> dayCounts = planService.getLastSevenDaysCompletedCount();