From cf1d086376cf7bf6f3b3b5fc9d4b33be646de1bf Mon Sep 17 00:00:00 2001
From: letsgocoding <sdxt_0802@163.com>
Date: 星期四, 13 二月 2025 15:17:55 +0800
Subject: [PATCH] !70 获取历史数据接口的修改 Merge pull request !70 from letsgocoding/wt_from_develop1.0
---
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
index d3e754c..07dbc79 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
@@ -75,8 +75,7 @@
i++;
};
startPage();
- List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
- //return AjaxResult.success(list);
+ List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
return getDataTable(list);
}
@@ -89,7 +88,7 @@
dataItem.setBeginTime(dataItem.getDataTime());
String endTime=aa+" 24:00:00";
dataItem.setEndTime(sf.parse(endTime));
- List<DailyKeyEquipment> list = dailykeyEquipment.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
+ List<DailyKeyEquipment> list = dailykeyEquipment.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
return AjaxResult.success(list);
}
/*鎵�鏈夎澶�*/
@@ -107,7 +106,6 @@
/**
* 閲嶇偣鑳借�楄澶�
- * @return
*/
@GetMapping("/getPointFacility")
@ApiOperation(value = "鏌ヨ閲嶇偣璁惧鍒楄〃")
--
Gitblit v1.9.3