From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 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 29baf7c..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,32 +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.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.FireDevStatusTotalRequest;
-import com.doumee.core.haikang.model.param.respose.FireDevStatusListResponse;
-import com.doumee.core.haikang.model.param.respose.MonthDataByMeterTypeResponse;
-import com.doumee.core.haikang.service.HKService;
-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.
@@ -43,6 +32,9 @@
@Autowired
private BoardService boardService;
+ @Autowired
+ private VisitsService visitsService;
+
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
@@ -52,11 +44,16 @@
}
+ /**
+ *
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
+ * @return
+ */
@LoginNoRequired
@ApiOperation("鎶ヨ淇℃伅")
@GetMapping("/alarmData")
- public ApiResponse<AlarmDataVO> alarmDataSumByCate() {
- AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate();
+ public ApiResponse<AlarmDataVO> alarmDataSumByCate(Integer type) {
+ AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate(type);
return ApiResponse.success(alarmDataVO);
}
@LoginNoRequired
@@ -66,6 +63,7 @@
List<AlarmEventDataVO> data = boardService.fightingAdminAlertList();
return ApiResponse.success(data);
}
+
@LoginNoRequired
@ApiOperation("妫�娴嬫暟鎹泦鍚�")
@GetMapping("/monitorDataList")
@@ -92,4 +90,21 @@
}
+ @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