From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 111 ++++++++++++++++++++++--------------------------------- 1 files changed, 44 insertions(+), 67 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..395bfce 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,22 +3,21 @@ 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.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; +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; 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; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.ArrayList; @@ -32,59 +31,28 @@ * @create 2024/10/28 13:42 */ -@Api(tags = "瀹夐槻绠℃帶澶у睆") +@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝畨闃茬鎺уぇ灞�") @RestController @Slf4j @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/security") public class SecurityController extends BaseController { - @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); } - @LoginNoRequired @ApiOperation("鍥尯瀹夐槻璁惧") @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,37 +61,34 @@ @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); } - - @LoginNoRequired @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 +117,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("鑾峰彇鐩戞帶娴佹挱鏀惧湴鍧�") + @PostMapping("/getCarmeraPreviemUrl") + public ApiResponse<String> getCarmeraPreviemUrl(@RequestBody 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