From 1d43e01376590a26a8e976a398b4744b6906cab4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 18:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index a2ddb0d..78a8c6f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -35,7 +35,7 @@
*/
@GetMapping("/assetManagement")
@ApiOperation(value = "璧勪骇绠＄悊", notes = "璧勪骇绠＄悊")
- @PreAuthorize("hasAuthority('assetManagement:page')")
+ @PreAuthorize("@ss.hasPermi('assetManagement:page')")
public Result assetManagement(DataCenterQuery query) {
return monitorService.assetManagement(query);
}
@@ -48,20 +48,9 @@
*/
@GetMapping("/platformOnlineRate")
@ApiOperation(value = "骞冲彴鍦ㄧ嚎鐜�", notes = "骞冲彴鍦ㄧ嚎鐜�")
- @PreAuthorize("hasAuthority('platformOnline:page')")
+ @PreAuthorize("@ss.hasPermi('platformOnline:page')")
public Result platformOnlineRate(DataCenterQuery query) {
return platformOnlineService.page(query);
- }
-
- /**
- * 瑙嗛锛氱偣浣嶅湪绾跨巼
- *
- * @param query
- * @return
- */
- @GetMapping("/videoPointOnlineRate")
- public Result videoPointOnlineRate(DataCenterQuery query) {
- return dataCenterService.videoPointOnlineRate(query);
}
/**
@@ -98,14 +87,36 @@
}
/**
- * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
+ * 瑙嗛锛氱偣浣嶅湪绾跨巼
*
* @param query
* @return
*/
- @GetMapping("/videoAvailabilityRate")
- public Result videoAvailabilityRate(DataCenterQuery query) {
+ @GetMapping("/videoPointOnlineRate")
+ public Result videoPointOnlineRate(DataCenterQuery query) {
+ return dataCenterService.videoPointOnlineRate(query);
+ }
+
+ /**
+ * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoMinistrySiteOnline")
+ public Result videoMinistrySiteOnline(DataCenterQuery query) {
return dataCenterService.videoAvailabilityRate(query);
+ }
+
+ /**
+ * 瑙嗛锛氶儴绾у贰妫�褰曞儚鍙敤鐜�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoMinistryVideoAvailable")
+ public Result videoMinistryVideoAvailable(DataCenterQuery query) {
+ return dataCenterService.videoLabelingAccuracy(query);
}
/**
@@ -117,17 +128,6 @@
@GetMapping("/videoImportantPointAvailabilityRate")
public Result videoImportantPointAvailabilityRate(DataCenterQuery query) {
return dataCenterService.videoImportantPointAvailabilityRate(query);
- }
-
- /**
- * 瑙嗛锛氭爣娉ㄦ纭巼
- *
- * @param query
- * @return
- */
- @GetMapping("/videoLabelingAccuracy")
- public Result videoLabelingAccuracy(DataCenterQuery query) {
- return dataCenterService.videoLabelingAccuracy(query);
}
/**
@@ -184,7 +184,16 @@
public Result videoImportantPointImageOnlineRate(DataCenterQuery query) {
return dataCenterService.videoImportantPointImageOnlineRate(query);
}
-
+ /**
+ * 瑙嗛锛氬浘鍍忚祫婧愬畨鍏ㄧ鐞�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImageResourceSecurity")
+ public Result videoImageResourceSecurity(DataCenterQuery query) {
+ return dataCenterService.videoImageResourceSecurity(query);
+ }
/**
* 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
--
Gitblit v1.8.0