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/FightingAdminController.java | 124 ++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 70 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java index 7591eee..01a7327 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java @@ -1,25 +1,21 @@ package com.doumee.cloud.board; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; -import com.doumee.core.model.ApiResponse; +import com.doumee.dao.admin.response.PCWorkPlatformDataVO; +import com.doumee.service.business.VisitsService; +import com.doumee.service.business.third.model.ApiResponse; import com.doumee.core.utils.Constants; -import com.doumee.dao.business.PlatformLogMapper; -import com.doumee.dao.business.model.PlatformLog; import com.doumee.dao.web.response.platformReport.*; +import com.doumee.service.business.third.BoardService; import io.swagger.annotations.*; 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 java.util.ArrayList; import java.util.List; -import java.util.Random; /** * Created by IntelliJ IDEA. @@ -28,99 +24,87 @@ * @create 2024/10/28 13:42 */ -@Api(tags = "娑堥槻绠℃帶澶у睆") +@Api(tags = "銆愮湅鏉垮ぇ灞忋�戞秷闃茬鎺уぇ灞�") @RestController @Slf4j @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/fightingAdmin") public class FightingAdminController extends BaseController { + @Autowired + private BoardService boardService; + @Autowired + private VisitsService visitsService; @LoginNoRequired @ApiOperation("涓績鏁版嵁") @GetMapping("/centerData") - public ApiResponse<FightingAdminBoardVO> centerData() { - FightingAdminBoardVO data = new FightingAdminBoardVO(); - Random random = new Random(); - data.setOfflineDeviceNum(random.nextInt(20)); - data.setOnlineDeviceNum(random.nextInt(20)); - data.setErrDeviceNum(random.nextInt(20)); - data.setShieldDeviceNum(random.nextInt(20)); - data.setTodayDangerNum(random.nextInt(20)); - data.setDealDangerNum(random.nextInt(20)); + public ApiResponse<FightingAdminCenterDataVO> centerData() { + FightingAdminCenterDataVO data = boardService.centerFightingAdminData(); return ApiResponse.success(data); } - @LoginNoRequired - @ApiOperation("浠婃棩鍚勭郴缁熻澶囩姸鎬佸強鍛婅鏁伴噺") - @GetMapping("/deviceAlarmData") - public ApiResponse<List<DeviceAlarmDataVO>> deviceAlarmData() { - List<DeviceAlarmDataVO> deviceAlarmDataVOList = new ArrayList<>(); - Random random = new Random(); - for (int i = 1; i <= 5; i++) { - DeviceAlarmDataVO deviceAlarmDataVO = new DeviceAlarmDataVO(); - deviceAlarmDataVO.setDeviceTypeName("璁惧鍚嶇О_"+i); - deviceAlarmDataVO.setAlarmNum(random.nextInt(20)); - deviceAlarmDataVO.setErrNum(random.nextInt(20)); - deviceAlarmDataVO.setOfflineNum(random.nextInt(20)); - deviceAlarmDataVO.setShieldNum(random.nextInt(20)); - deviceAlarmDataVO.setStatusTotal(deviceAlarmDataVO.getAlarmNum() + deviceAlarmDataVO.getErrNum() + deviceAlarmDataVO.getOfflineNum() + deviceAlarmDataVO.getShieldNum()); - deviceAlarmDataVOList.add(deviceAlarmDataVO); - } - return ApiResponse.success(deviceAlarmDataVOList); - } - - + /** + * + * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾 + * @return + */ @LoginNoRequired @ApiOperation("鎶ヨ淇℃伅") @GetMapping("/alarmData") - public ApiResponse<AlarmDataVO> alarmData() { - AlarmDataVO alarmDataVO = new AlarmDataVO(); - Random random = new Random(); - alarmDataVO.setTotalNum(random.nextInt(30)); - alarmDataVO.setRealNum(random.nextInt(alarmDataVO.getTotalNum())); - alarmDataVO.setErrNum(random.nextInt(alarmDataVO.getRealNum())); - alarmDataVO.setLiftNum(random.nextInt(alarmDataVO.getErrNum())); - alarmDataVO.setProcessingNum(random.nextInt(alarmDataVO.getErrNum())); + public ApiResponse<AlarmDataVO> alarmDataSumByCate(Integer type) { + AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate(type); return ApiResponse.success(alarmDataVO); } - - + @LoginNoRequired + @ApiOperation("鍛婅淇℃伅闆嗗悎") + @GetMapping("/alarmDataList") + public ApiResponse<List<AlarmEventDataVO>> alarmDataList() { + List<AlarmEventDataVO> data = boardService.fightingAdminAlertList(); + return ApiResponse.success(data); + } @LoginNoRequired - @ApiOperation("鍛婅澶勭悊鍒嗘瀽") - @GetMapping("/alarmHandleData") - public ApiResponse<List<AlarmHandleDataVO>> alarmHandleData(@RequestParam Integer type) { - List<AlarmHandleDataVO> alarmHandleDataVOList = new ArrayList<>(); - Random random = new Random(); - for (int i = 1; i <= 12; i++) { - AlarmHandleDataVO alarmHandleDataVO = new AlarmHandleDataVO(); - alarmHandleDataVO.setMonthStr(i+"鏈�"); - alarmHandleDataVO.setAlarmNum(random.nextInt(20)); - alarmHandleDataVO.setErrNum(random.nextInt(20)); - alarmHandleDataVO.setLiftNum(random.nextInt(20)); - alarmHandleDataVO.setProcessingNum(random.nextInt(20)); - alarmHandleDataVOList.add(alarmHandleDataVO); - } - return ApiResponse.success(alarmHandleDataVOList); + @ApiOperation("妫�娴嬫暟鎹泦鍚�") + @GetMapping("/monitorDataList") + public ApiResponse<List<MonitorDataVO>> monitorDataList() { + List<MonitorDataVO> data = boardService.monitorDataList(); + return ApiResponse.success(data); } + @LoginNoRequired - @ApiOperation("鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌") + @ApiOperation("鍛婅澶勭悊鍒嗘瀽闆嗗悎") + @GetMapping("/alarmHandleData") + public ApiResponse<List<AlarmDataVO>> alarmHandleData() { + List<AlarmDataVO> alarmHandleDataVOList = boardService.fightingAlarmHandleData(); + return ApiResponse.success(alarmHandleDataVOList); + } + @LoginNoRequired + @ApiOperation("鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌") @GetMapping("/yearDeviceData") public ApiResponse<YearDeviceDataVO> yearDeviceData() { - Random random = new Random(); - YearDeviceDataVO yearDeviceDataVO = new YearDeviceDataVO(); - yearDeviceDataVO.setMonthAddNum(random.nextInt(100)); - yearDeviceDataVO.setPlanProtectTotal(random.nextInt(1000)); - yearDeviceDataVO.setProtectNum(yearDeviceDataVO.getPlanProtectTotal()); + YearDeviceDataVO yearDeviceDataVO = boardService.yearFightingAdminDeviceData(); return ApiResponse.success(yearDeviceDataVO); } + @LoginNoRequired + @ApiOperation("娓╂箍搴︽暟鎹�") + @GetMapping("/getTemperatureHumidityData") + public ApiResponse<List<TemperatureHumidityDataVO>> getTemperatureHumidityData() { + List<TemperatureHumidityDataVO> list = boardService.getTemperatureHumidityData(); + return ApiResponse.success(list); + } - + @LoginNoRequired + @ApiOperation("瀹炴椂鍦ㄥ満浜哄憳鍒嗗竷") + @GetMapping("/inParkUser") + public ApiResponse<PCWorkPlatformDataVO> inParkUser() { + PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(Constants.ONE,null); + return ApiResponse.success(pcWorkPlatformDataVO); + } } -- Gitblit v1.9.3