From 4b8fda000f9f600ba5187e738278b340b55ebd7c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 18 十二月 2024 18:41:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 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..f3f15b5 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,19 @@ 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.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. @@ -92,4 +79,14 @@ } + @LoginNoRequired + @ApiOperation("娓╂箍搴︽暟鎹�") + @GetMapping("/getTemperatureHumidityData") + public ApiResponse<List<TemperatureHumidityDataVO>> getTemperatureHumidityData() { + List<TemperatureHumidityDataVO> list = boardService.getTemperatureHumidityData(); + return ApiResponse.success(list); + } + + + } -- Gitblit v1.9.3