From 03e3f933f10fb9228eef02c5699b749a501a50e7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十一月 2024 09:27:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index fb631e5..324108e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
+import com.doumee.core.haikang.model.param.respose.RuleEventSearchResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -73,7 +74,8 @@
@ApiOperation("鍥尯瀹夐槻璁惧")
@GetMapping("/securityDeviceData")
public ApiResponse<List<SecurityDeviceDataVO>> securityDeviceData() {
- List<SecurityDeviceDataVO> list = new ArrayList<>();
+ List<SecurityDeviceDataVO> list = boardService.securityDeviceData();
+ /*
Random random = new Random();
for (int i = 1; i <= 3; i++) {
SecurityDeviceDataVO data = new SecurityDeviceDataVO();
@@ -82,7 +84,27 @@
data.setOfflineDeviceNum(random.nextInt(10));
data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
list.add(data);
- }
+ }*/
+ return ApiResponse.success(list);
+ }
+ @LoginNoRequired
+ @ApiOperation("瀹夐槻鍛婅鎺ュ彛")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0鍏ㄩ儴 1鍖哄煙鍛婅 2琛屼负鍛婅", required = false)
+ })
+ @GetMapping("/warningEventData")
+ public ApiResponse<List<WaningEventDataVO>> warningEventData(Integer type) {
+ List<WaningEventDataVO> list = boardService.warningEventData(type);
+ /*
+ Random random = new Random();
+ for (int i = 1; i <= 3; i++) {
+ SecurityDeviceDataVO data = new SecurityDeviceDataVO();
+ data.setDeviceType("璁惧绫诲瀷_"+i);
+ data.setOnlineNum(random.nextInt(10));
+ data.setOfflineDeviceNum(random.nextInt(10));
+ data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
+ list.add(data);
+ }*/
return ApiResponse.success(list);
}
--
Gitblit v1.9.3