Merge remote-tracking branch 'origin/master'

k94314517

2025-03-07 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java

@@ -2,18 +2,16 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
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;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
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.util.List;

@@ -36,12 +34,21 @@
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<EnergyBoardVO> centerData() {

        EnergyBoardVO data =boardService.centerEnergyData();

        return ApiResponse.success(data);
    }



    @LoginNoRequired
    @ApiOperation("中心用电能耗数据")
    @GetMapping("/regionDataRanking")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：1=今日；2=本月；3=昨日", required = true),
    })
    public ApiResponse<List<RegionDataRankingDataResponse>> regionDataRanking(@RequestParam Integer type) {
        return ApiResponse.success(boardService.getRegionDataRanking(type));
    }


    @LoginNoRequired
@@ -51,11 +58,12 @@
         RegionEnergyListResponse  data=boardService.energyRegionData();
        return ApiResponse.success(data);
    }


    @LoginNoRequired
    @ApiOperation("实时负荷曲线")
    @GetMapping("/loadCurve")
    public ApiResponse<List<EnergyDataVO>> loadCurve() {

        List<EnergyDataVO> loadCurveList =boardService.loadEnergyCurve();
        return ApiResponse.success(loadCurveList);
    }