From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-admin/src/main/java/com/zhitan/web/controller/processenergy/DailyProcessEnergyController.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/processenergy/DailyProcessEnergyController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/processenergy/DailyProcessEnergyController.java
new file mode 100644
index 0000000..45c2acf
--- /dev/null
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/processenergy/DailyProcessEnergyController.java
@@ -0,0 +1,90 @@
+package com.zhitan.web.controller.processenergy;
+
+import com.zhitan.basicdata.domain.FacilityArchives;
+import com.zhitan.common.core.controller.BaseController;
+import com.zhitan.common.core.domain.AjaxResult;
+import com.zhitan.model.domain.EnergyIndex;
+import com.zhitan.model.domain.ModelNode;
+import com.zhitan.model.service.IModelNodeService;
+import com.zhitan.processenergy.domain.DailyProcessEnergy;
+import com.zhitan.processenergy.service.IDailyProcessEnergyService;
+import com.zhitan.realtimedata.domain.DataItem;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+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.RestController;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 宸ュ簭鑳借�� 鏃�
+ */
+@RestController
+@RequestMapping("/processEnergy/dailyProcessEnergy")
+@Api(value = "宸ュ簭鑳借�楃粺璁★紙鏃ワ級", tags = {"宸ュ簭鑳借�楃粺璁�"})
+public class DailyProcessEnergyController extends BaseController {
+
+ @Autowired
+ private IModelNodeService modelNodeService;
+
+ @Autowired
+ private IDailyProcessEnergyService dailyProcessEnergy;
+
+ @GetMapping("/list")
+ @ApiOperation(value = "宸ュ簭鑳借�楃粺璁★紙鏃ワ級鍒楄〃")
+ public AjaxResult list(DataItem dataItem) throws ParseException{
+ List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
+ if(CollectionUtils.isEmpty(nodeId)){
+ return success(new ArrayList<>());
+ }
+ List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
+ if(CollectionUtils.isEmpty(energyList)){
+ return success(new ArrayList<>());
+ }
+ List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
+ List<DailyProcessEnergy> dataList = new ArrayList<>();
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String aa= df.format(dataItem.getDataTime());
+ String bb="";
+ int i = 0;
+ dataItem.setBeginTime(dataItem.getDataTime());
+ String endTime=aa+" 24:00:00";
+ dataItem.setEndTime(sf.parse(endTime));
+ while (i < 24) {
+ if(i>9){
+ bb=aa+" "+i+":00:00";
+ }else{
+ bb=aa+" 0"+i+":00:00";
+ }
+ DailyProcessEnergy report=new DailyProcessEnergy();
+ report.setDataTime(sf.parse(bb));
+ report.setValue("value"+i);
+ dataList.add(report);
+ i++;
+ }
+ List<DailyProcessEnergy> list = dailyProcessEnergy.getDailyProcessEnergyList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ return success(list);
+ }
+
+ @GetMapping("/listChart")
+ @ApiOperation(value = "宸ュ簭鑳借�楋紙鏃ワ級鍥捐〃")
+ public AjaxResult listChart(DataItem dataItem) throws ParseException {
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String aa= df.format(dataItem.getDataTime());
+ dataItem.setBeginTime(dataItem.getDataTime());
+ String endTime=aa+" 24:00:00";
+ dataItem.setEndTime(sf.parse(endTime));
+ List<DailyProcessEnergy> list = dailyProcessEnergy.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ return AjaxResult.success(list);
+ }
+}
--
Gitblit v1.9.3