From 28dc7dc6eab44e3988886e9b0304c95d1ffb281d Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 20 三月 2025 17:51:58 +0800
Subject: [PATCH] 重点设备能耗年优化
---
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
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 4d24ed4..03ff12b 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,14 +1,18 @@
package com.zhitan.web.controller.keyequipment;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
+import com.zhitan.common.utils.DateTimeUtil;
+import com.zhitan.common.utils.TypeTime;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import com.zhitan.keyequipment.service.IYearKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.ModelNode;
import com.zhitan.model.service.IModelNodeService;
import com.zhitan.realtimedata.domain.DataItem;
+import com.zhitan.realtimedata.domain.dto.DataItemQueryDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -17,13 +21,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.text.DateFormat;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
-
/**
*閲嶇偣璁惧鑳借�楃粺璁� 骞�
*
@@ -52,38 +54,21 @@
return success(new ArrayList<>());
}
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.getDataTime());
- String bb="";
- int i = 1;
- while (i <= 12) {
- if(i>9){
- bb=aa+"-"+i+"-01 00:00:00";
- }else{
- bb=aa+"-0"+i+"-01 00:00:00";
- }
- YearKeyEquipment report=new YearKeyEquipment();
- report.setDataTime(sf.parse(bb));
- report.setValue("value"+i);
- dataList.add(report);
- i++;
- }
-
- List<YearKeyEquipment> list = yearKeyEquipmentService.getYearKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ Date convertTime = DateTimeUtil.getEndTimeByType(dataItem.getTimeType(),dataItem.getDataTime());
+ DateTime beginTime = DateUtil.beginOfYear(convertTime);
+ DateTime endTime = DateUtil.endOfYear(convertTime);
+ List<TypeTime> typeTimeList = DateTimeUtil.getDateTimeList(dataItem.getTimeType(),convertTime);
+ List<YearKeyEquipment> list = yearKeyEquipmentService.getYearKeyEquipmentList(indexIds, typeTimeList,beginTime,endTime, dataItem.getTimeType(),dataItem.getEnergyType());
return success(list);
}
@GetMapping("/listChart")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楃粺璁★紙骞达級鍥捐〃")
- public AjaxResult listChart(DataItem dataItem){
+ public AjaxResult listChart(DataItemQueryDTO queryDto){
- List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(queryDto);
return AjaxResult.success(list);
}
}
--
Gitblit v1.9.3