From 56a0692624bad9d65feaf0b31b8c28eb698f3c9f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 14 十一月 2024 17:48:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 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 0622588..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
@@ -2,15 +2,19 @@
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.*;
+import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -34,6 +38,8 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/security")
public class SecurityController extends BaseController {
+ @Autowired
+ private BoardService boardService;
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@@ -68,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();
@@ -77,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);
}
@@ -101,4 +128,35 @@
}
+ @LoginNoRequired
+ @ApiOperation("璁垮鍒嗘瀽")
+ @GetMapping("/getVisitData")
+ public ApiResponse<VisitDataVO> getVisitData() {
+ VisitDataVO visitDataVO = new VisitDataVO();
+ Random random = new Random();
+ visitDataVO.setRegisterVisitNum(random.nextInt(20));
+ visitDataVO.setRegisterVisitRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setLevelNum(random.nextInt(20));
+ visitDataVO.setLevelRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setWaitVisitNum(random.nextInt(20));
+ visitDataVO.setWaitVisitRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setRetentionNum(random.nextInt(20));
+ visitDataVO.setRetentionRata(BigDecimal.valueOf(random.nextInt(20)));
+ return ApiResponse.success(visitDataVO);
+ }
+ @LoginNoRequired
+ @ApiOperation("鏍戝舰鍖哄煙闆嗗悎鎺ュ彛")
+ @GetMapping("/regionTree")
+ public ApiResponse<List<PageRegionInfoResponse>> regionTree(CarmeraListVO param) {
+ return ApiResponse.success(boardService.getRegionTree(param));
+ }
+ @LoginNoRequired
+ @ApiOperation("骞抽摵缁撴灉鍖哄煙闆嗗悎鎺ュ彛")
+ @GetMapping("/regionList")
+ public ApiResponse<List<PageRegionInfoResponse>> regionList(CarmeraListVO param) {
+ return ApiResponse.success(boardService.regionList(param));
+ }
+
+
+
}
--
Gitblit v1.9.3