From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 e727bd7..8d08491 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
@@ -2,7 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
@@ -53,6 +53,7 @@
List<AlarmEventDataVO> data = boardService.fightingAdminAlertList();
return ApiResponse.success(data);
}
+
@LoginNoRequired
@ApiOperation("妫�娴嬫暟鎹泦鍚�")
@GetMapping("/monitorDataList")
@@ -79,4 +80,14 @@
}
+ @LoginNoRequired
+ @ApiOperation("娓╂箍搴︽暟鎹�")
+ @GetMapping("/getTemperatureHumidityData")
+ public ApiResponse<List<TemperatureHumidityDataVO>> getTemperatureHumidityData() {
+ List<TemperatureHumidityDataVO> list = boardService.getTemperatureHumidityData();
+ return ApiResponse.success(list);
+ }
+
+
+
}
--
Gitblit v1.9.3