From 0541c0791acea41b584f71fc59e22d4d21ba0883 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 四月 2026 11:10:46 +0800
Subject: [PATCH] ``` refactor(energy): 优化实时能耗数据服务实现
---
src/main/java/com/ruoyi/http/service/controller/JclyController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/http/service/controller/JclyController.java b/src/main/java/com/ruoyi/http/service/controller/JclyController.java
index ed86d62..2f966d2 100644
--- a/src/main/java/com/ruoyi/http/service/controller/JclyController.java
+++ b/src/main/java/com/ruoyi/http/service/controller/JclyController.java
@@ -7,6 +7,7 @@
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.naming.ldap.PagedResultsControl;
@@ -32,6 +33,18 @@
private final String DEVICE_GUID_6 = "90878497978270816672";
+ private final String DEVICE_GUID_7 = "90140305546502568592";
+
+ private final String DEVICE_GUID_8 = "90169534185157152878";
+
+ private final String DEVICE_GUID_9 = "90276104525436465283";
+
+ private final String DEVICE_GUID_10 = "90543538108119559625";
+
+ private final String DEVICE_GUID_11 = "90689981408895835872";
+
+ private final String DEVICE_GUID_12 = "90943795336343088068";
+
/**
* 瀹炴椂鑾峰彇娓╂箍搴︼紝浜屾哀鍖栫⒊鏁版嵁
*/
@@ -39,12 +52,33 @@
public AjaxResult getRealData() {
List<Map<String,String>> maps = realTimeEnergyConsumptionService
.getRealData(Arrays.
- asList(DEVICE_GUID,
+ asList(
+ DEVICE_GUID,
DEVICE_GUID_2,
DEVICE_GUID_3,
DEVICE_GUID_4,
DEVICE_GUID_5,
- DEVICE_GUID_6));
+ DEVICE_GUID_6,
+ DEVICE_GUID_7,
+ DEVICE_GUID_8,
+ DEVICE_GUID_9,
+ DEVICE_GUID_10,
+ DEVICE_GUID_11,
+ DEVICE_GUID_12
+ ));
+ return AjaxResult.success(maps);
+ }
+
+
+
+ /**
+ * 鑾峰彇鍘嗗彶鏁版嵁
+ */
+ @GetMapping("/getHistoryData")
+ public AjaxResult getHistoryData(@RequestParam(value = "guid") String guid,
+ @RequestParam(value = "startTime") long startTime,
+ @RequestParam(value = "endTime") long endTime) {
+ List<Map<String,String>> maps = realTimeEnergyConsumptionService.getHistoryData(guid, startTime, endTime);
return AjaxResult.success(maps);
}
--
Gitblit v1.9.3