From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 aa80c65..ac287f6 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
@@ -3,7 +3,6 @@
import com.zhitan.basicdata.domain.FacilityArchives;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
-import com.zhitan.common.core.page.TableDataInfo;
import com.zhitan.keyequipment.domain.DailyKeyEquipment;
import com.zhitan.keyequipment.service.IDailyKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
@@ -43,14 +42,14 @@
@GetMapping("/list")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楀垎鏋愶紙鏃ワ級鍒楄〃")
- public TableDataInfo list(DataItem dataItem) throws ParseException {
+ public AjaxResult list(DataItem dataItem) throws ParseException {
List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
if(CollectionUtils.isEmpty(nodeId)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
if(CollectionUtils.isEmpty(energyList)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
List<DailyKeyEquipment> dataList=new ArrayList<>();
@@ -74,9 +73,10 @@
dataList.add(report);
i++;
};
- startPage();
- List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
- return getDataTable(list);
+
+ List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+
+ return success(list);
}
@GetMapping("/listChart")
@@ -88,12 +88,12 @@
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);
}
/*鎵�鏈夎澶�*/
@GetMapping("/getFacilityArchives")
- @ApiOperation(value = "鏌ヨ鎵�鏈夎澶囧垪琛�")
+ @ApiOperation(value = "鏌ヨ閲嶇偣璁惧鍒楄〃")
public AjaxResult getFacilityArchives() {
try {
List<FacilityArchives> list=dailykeyEquipment.getFacilityArchives();
--
Gitblit v1.9.3