From ef8e9ff831451a52a6c0219fc9eab5d3cea0494b Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期二, 11 二月 2025 15:47:48 +0800
Subject: [PATCH] 年数据获取接口调整
---
zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java | 4 ++++
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java
index ead5b3f..fc5a46c 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java
@@ -88,6 +88,10 @@
@GetMapping("/listChart")
@ApiOperation(value = "鑾峰彇缁煎悎鎸囨爣鍒嗘瀽鍥捐〃锛堝勾锛夋暟鎹�")
public AjaxResult listChart(DataItem dataItem){
+
+ dataItem.setBeginTime(DateUtil.beginOfYear(dataItem.getDataTime()));
+ dataItem.setEndTime(DateUtil.endOfYear(dataItem.getDataTime()));
+
List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
return AjaxResult.success(list);
}
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
index 00afae6..8f0c4c5 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
@@ -1,8 +1,10 @@
package com.zhitan.web.controller.keyequipment;
+import cn.hutool.core.date.DateUtil;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
import com.zhitan.common.core.page.TableDataInfo;
+import com.zhitan.comprehensivestatistics.domain.YearComperhensive;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import com.zhitan.keyequipment.service.IYearKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
@@ -53,9 +55,13 @@
}
List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
List<YearKeyEquipment> dataList=new ArrayList<>();
+
+ dataItem.setBeginTime(DateUtil.beginOfYear(dataItem.getDataTime()));
+ dataItem.setEndTime(DateUtil.endOfYear(dataItem.getDataTime()));
+
DateFormat df = new SimpleDateFormat("yyyy");
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String aa= df.format(dataItem.getBeginTime());
+ String aa= df.format(dataItem.getDataTime());
String bb="";
int i = 1;
while (i <= 12) {
@@ -78,6 +84,7 @@
@GetMapping("/listChart")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楃粺璁★紙骞达級鍥捐〃")
public AjaxResult listChart(DataItem dataItem){
+
List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
return AjaxResult.success(list);
}
--
Gitblit v1.9.3