From db0f521bf51f96029090ebc01dfa96fc163127a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 15 十一月 2024 18:29:03 +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 | 102 ++++++++++++++++++++++-----------------------------
1 files changed, 44 insertions(+), 58 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 324108e..64ebdac 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
@@ -1,12 +1,18 @@
package com.doumee.cloud.board;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
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.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
+import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.response.platformReport.*;
+import com.doumee.service.business.VisitsService;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -15,10 +21,7 @@
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;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -40,32 +43,14 @@
@Autowired
private BoardService boardService;
+ @Autowired
+ private VisitsService visitsService;
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
- public ApiResponse<SecurityBoardVO> centerData() {
- SecurityBoardVO data = new SecurityBoardVO();
- Random random = new Random();
- data.setParkingLotTotal(random.nextInt(200));
- data.setFreeParkingLot(random.nextInt(data.getParkingLotTotal()));
-
- data.setInternalCarTotal(random.nextInt(100));
- data.setRelatedCarTotal(random.nextInt(100));
- data.setVisitCarTotal(random.nextInt(100));
- data.setInParkCarTotal(data.getInternalCarTotal() + data.getRelatedCarTotal() + data.getVisitCarTotal());
-
- data.setInternalTotal(random.nextInt(100));
- data.setRelatedTotal(random.nextInt(100));
- data.setVisitTotal(random.nextInt(100));
- data.setInParkTotal(data.getInternalTotal() + data.getRelatedTotal() + data.getVisitTotal());
-
- data.setDeviceTotal(random.nextInt(20));
- data.setErrTotal(random.nextInt(20));
- data.setInternalJobCarTotal(random.nextInt(20));
- data.setVisitJobCarTotal(random.nextInt(20));
- data.setRelatedJobCarTotal(random.nextInt(20));
-
+ public ApiResponse<SecurityBoardVO> centerSecurityData() {
+ SecurityBoardVO data = boardService.centerSecurityData();
return ApiResponse.success(data);
}
@@ -75,16 +60,6 @@
@GetMapping("/securityDeviceData")
public ApiResponse<List<SecurityDeviceDataVO>> securityDeviceData() {
List<SecurityDeviceDataVO> list = boardService.securityDeviceData();
- /*
- 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);
}
@LoginNoRequired
@@ -93,18 +68,8 @@
@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);
- }*/
+ public ApiResponse<WaningEventDataVO> warningEventData(Integer type) {
+ WaningEventDataVO list = boardService.warningEventData(type);
return ApiResponse.success(list);
}
@@ -115,15 +80,24 @@
@ApiOperation("璁垮婊炵暀鎯呭喌")
@GetMapping("/visitRetentionData")
public ApiResponse<List<VisitRetentionDataVO>> visitRetentionData() {
+ PageWrap<Visits> pageWrap = new PageWrap<>();
+ pageWrap.setCapacity(10);
+ pageWrap.setPage(1);
+ pageWrap.setModel(new Visits());
+ pageWrap.getModel().setLevelStatus(Constants.ZERO);
+ pageWrap.getModel().setStatus(Constants.TWO);
+ PageData<Visits> resut = visitsService.retentionPage(pageWrap);
List<VisitRetentionDataVO> list = new ArrayList<>();
- Random random = new Random();
- for (int i = 1; i <= 3; i++) {
- VisitRetentionDataVO data = new VisitRetentionDataVO();
- data.setName("灏忔槑_"+i);
- data.setCompanyName("杩愮淮缁刜"+i);
- data.setTimeOutMinute(Long.valueOf(random.nextInt(200)));
- list.add(data);
+ if(resut !=null && resut.getRecords() !=null && resut.getRecords().size()>0){
+ for (Visits model : resut.getRecords()) {
+ VisitRetentionDataVO data = new VisitRetentionDataVO();
+ data.setName(model.getName());
+ data.setCompanyName(model.getCompanyName());
+ data.setTimeOutMinute(Constants.formatIntegerNum(model.getTimeOut()));
+ list.add(data);
+ }
}
+
return ApiResponse.success(list);
}
@@ -152,11 +126,23 @@
}
@LoginNoRequired
@ApiOperation("骞抽摵缁撴灉鍖哄煙闆嗗悎鎺ュ彛")
- @GetMapping("/regionList")
- public ApiResponse<List<PageRegionInfoResponse>> regionList(CarmeraListVO param) {
+ @PostMapping("/regionList")
+ public ApiResponse<List<PageRegionInfoResponse>> regionList(@RequestBody CarmeraListVO param) {
return ApiResponse.success(boardService.regionList(param));
}
+ @LoginNoRequired
+ @ApiOperation("鑾峰彇鐩戞帶娴佹挱鏀惧湴鍧�")
+ @GetMapping("/getCarmeraPreviemUrl")
+ public ApiResponse<String> getCarmeraPreviemUrl(CarmeraListVO param) {
+ return ApiResponse.success(boardService.getCarmeraPreviemUrl(param));
+ }
-
+ @LoginNoRequired
+ @ApiOperation("浠婃棩璁垮鍒嗘瀽鍜屾粸鐣欒瀹㈡暟鎹泦鍚�")
+ @GetMapping("/visitSecurityData")
+ public ApiResponse<VisitDataVO> visitSecurityData ( ){
+ VisitDataVO data = boardService.visitSecurityData();
+ return ApiResponse.success(data);
+ }
}
--
Gitblit v1.9.3