From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001 From: DYL0109 <dn18191638832@163.com> Date: 星期三, 16 四月 2025 19:20:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev --- zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyDataItemController.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyDataItemController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyDataItemController.java index af79e0b..b3028e2 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyDataItemController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/EnergyDataItemController.java @@ -1,9 +1,12 @@ package com.zhitan.web.controller.statisticalAnalysis; import com.zhitan.common.annotation.Log; +import com.zhitan.common.constant.CommonConst; import com.zhitan.common.core.domain.AjaxResult; import com.zhitan.dataitem.service.IDataItemService; import com.zhitan.statisticalAnalysis.domain.dto.FlowChartsDTO; +import com.zhitan.statisticalAnalysis.domain.vo.QueryCompareRequest; +import com.zhitan.statisticalAnalysis.service.IEnergyConsumeDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +27,9 @@ @Autowired private IDataItemService dataItemService; + @Autowired + private IEnergyConsumeDataService energyConsumeDataService; + /** * 鑾峰彇鑳芥祦鍥惧舰鍒嗘瀽 * @@ -36,4 +42,28 @@ public AjaxResult getFlowCharts(@Validated FlowChartsDTO dto) { return AjaxResult.success(dataItemService.getFlowCharts(dto)); } + + @Log(title = "鑳借�楃粺璁″垎鏋�-鑾峰彇鍚屾瘮鍒嗘瀽鍒楄〃鏁版嵁") + @ApiOperation(value = "鑳借�楃粺璁″垎鏋�-鑾峰彇鍚屾瘮鍒嗘瀽鍒楄〃鏁版嵁", notes = "鑳借�楃粺璁″垎鏋�-鑾峰彇鍚屾瘮鍒嗘瀽鍒楄〃鏁版嵁") + @GetMapping(value = "/querySameCompareList") + public AjaxResult querySameCompareList(@Validated QueryCompareRequest queryCompareRequest) { + return AjaxResult.success(energyConsumeDataService.listEnergyTypeYoyInfo(queryCompareRequest, CommonConst.ENERGY_COMPARISON_YOY)); + } + + /** + * 鑾峰彇鐜瘮鍒嗘瀽鏁版嵁 + * <p> + * 閫氳繃鑷繁鐨勬湇鍔¤闂湴鍧�锛歨ttp://localhost:7005/fengniao/energyDataItem/queryLoopCompare?timeType=1 + * 閫氳繃缃戝叧璁块棶鍦板潃锛歨ttp://localhost:9999/jeecg-fengniao/fengniao/energyDataItem/queryLoopCompare?timeType=1 + * + * @param queryCompareRequest + * @return + */ + @Log(title = "鑳借�楃粺璁″垎鏋�-鑾峰彇鐜瘮鍒嗘瀽鍒楄〃鏁版嵁") + @ApiOperation(value = "鑳借�楃粺璁″垎鏋�-鑾峰彇鐜瘮鍒嗘瀽鍒楄〃鏁版嵁", notes = "鑳借�楃粺璁″垎鏋�-鑾峰彇鐜瘮鍒嗘瀽鍒楄〃鏁版嵁") + @GetMapping(value = "/queryLoopCompareList") + public AjaxResult queryLoopCompareList(@Validated QueryCompareRequest queryCompareRequest) { + + return AjaxResult.success(energyConsumeDataService.listEnergyTypeYoyInfo(queryCompareRequest, CommonConst.ENERGY_COMPARISON_MOM)); + } } -- Gitblit v1.9.3