From 55ff4ad6155248a7c2f391fd4fe75682a311dac0 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 16:54:26 +0800
Subject: [PATCH] refactor(svg): 优化 SVG相关组件功能
---
zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 32f4443..3f6a91b 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
@@ -1,5 +1,6 @@
package com.zhitan.web.controller.comprehensivestatistics;
+import cn.hutool.core.date.DateUtil;
import com.zhitan.common.annotation.Log;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
@@ -51,25 +52,29 @@
return AjaxResult.success("鏆傛棤鏁版嵁");
}
List<YearComperhensive> 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 bb="";
+ String aa = df.format(dataItem.getDataTime());
+ String bb = "";
int i = 1;
while (i <= 12) {
- if(i>9){
- bb=aa+"-"+i+"-01 00:00:00";
+ if(i > 9){
+ bb = aa + "-" + i + "-01 00:00:00";
}else{
- bb=aa+"-0"+i+"-01 00:00:00";
+ bb = aa + "-0" + i + "-01 00:00:00";
}
YearComperhensive report = new YearComperhensive();
report.setDataTime(sf.parse(bb));
- report.setValue("value"+i);
+ report.setValue("value" + i);
dataList.add(report);
i++;
}
List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(),
- dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
+ dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
return AjaxResult.success(list);
} catch (Exception ex) {
logger.error("鑾峰彇鍑洪敊锛�", ex);
@@ -83,7 +88,11 @@
@GetMapping("/listChart")
@ApiOperation(value = "鑾峰彇缁煎悎鎸囨爣鍒嗘瀽鍥捐〃锛堝勾锛夋暟鎹�")
public AjaxResult listChart(DataItem dataItem){
- List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
+
+ 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.getEnergyType());
return AjaxResult.success(list);
}
@@ -118,7 +127,7 @@
i++;
}
List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(),
- dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
+ dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
if(CollectionUtils.isNotEmpty(list)){
list.forEach(this::valueRep);
}
--
Gitblit v1.9.3