From 0e49c2c61b26146d1a826edd6afa5d8c03696e59 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期二, 11 二月 2025 10:27:50 +0800
Subject: [PATCH] !57 能源流向分析 Merge pull request !57 from DYL0109/dyl_dev
---
zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
index 6434f20..b20411c 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
@@ -1,9 +1,12 @@
package com.zhitan.web.controller.energyMonitor;
import com.zhitan.common.annotation.Log;
+import com.zhitan.common.constant.CommonConst;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
-import com.zhitan.energyMonitor.service.IEnergyUnitToDeviceService;
+import com.zhitan.energyMonitor.domain.vo.ListElectricLoadVO;
+import com.zhitan.energyMonitor.service.IElectricLoadService;
+import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.service.IEnergyIndexService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,33 +29,29 @@
@Slf4j
public class ElectricLoadController extends BaseController {
@Autowired
- private IEnergyUnitToDeviceService energyUnitToDeviceService;
-// @Autowired
-// private IElectricLoadService electricLoadService;
+ private IElectricLoadService electricLoadService;
@Autowired
private IEnergyIndexService energyIndexService;
/**
* 鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
*
- * @param energyUnitId 鐢ㄨ兘鍗曞厓id
- * @param meterId 鐢佃〃id
- * @param timeType 鏃堕棿绫诲瀷 DAY/MONTH/YEAR
- * @param timeCode 鏃堕棿鍊� 涓庢椂闂寸被鍨嬪搴旓細2022-03-21/2022-03/2022
- * @return
+ * @param nodeId 鐢ㄨ兘鍗曞厓id
+ * @param meterId 鐢佃〃id
+ * @param timeType 鏃堕棿绫诲瀷 DAY/MONTH/YEAR
+ * @param timeCode 鏃堕棿鍊� 涓庢椂闂寸被鍨嬪搴旓細2022-03-21/2022-03/2022
*/
@Log(title = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁")
@ApiOperation(value = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁", notes = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁")
@GetMapping(value = "/detail")
- public AjaxResult list(@RequestParam(name = "energyUnitId") String energyUnitId,
+ public AjaxResult list(@RequestParam(name = "nodeId") String nodeId,
@RequestParam(name = "meterId") String meterId,
@RequestParam(name = "timeType") String timeType,
@RequestParam(name = "timeCode") String timeCode) {
-// EnergyIndex energyIndex = energyIndexService.getDeviceIndexByCode(energyUnitId, meterId, CommonConst.TAG_CODE_ZYGGL);
-//
-// EnergyUnitToDevice energyUnitToDevice = energyUnitToDeviceService.getEnergyUnitToDeviceById(energyUnitId, meterId);
-// ListElectricLoadVO lsvo = electricLoadService.list(timeType, timeCode, energyIndex, energyUnitToDevice);
- return AjaxResult.success(null);
+ EnergyIndex energyIndex = energyIndexService.getDeviceIndexByCode(nodeId, meterId, CommonConst.TAG_CODE_ZYGGL);
+
+ ListElectricLoadVO vo = electricLoadService.list(timeType, timeCode, energyIndex);
+ return AjaxResult.success(vo);
}
}
--
Gitblit v1.9.3