From 567cc067da295b3d7cb1f42af6f2137fbeabb9e8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 18 六月 2025 10:22:21 +0800
Subject: [PATCH] 导出实时数据
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index ba5e146..b4893b2 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -1141,8 +1141,9 @@
public void exportPowerHistoryList(HttpServletResponse response, HttpServletRequest
request, @RequestBody PowerNetFactorHisReqDTO dto) throws IOException {
log.info("exportPowerHistoryList开始");
+ String firstCol = "时间";
List<String> column = new ArrayList<>();
- column.add("时间");
+ column.add(firstCol);
List<List<Object>> exportData = new ArrayList<>();
List<String> nodeCodeList = dto.getNodeCodeList();
@@ -1243,16 +1244,24 @@
}
dataAll.put(powerNetFactorQuery.getNodeName(), dataMap);
}
-
+ log.info("column=" + JSONArray.toJSONString(column));
for (String cate : categories) {
List<Object> row = new ArrayList<>();
- row.add(cate);
for (String col : column) {
- row.add(dataAll.get(col).get(cate));
+ if (firstCol.equals(col)) {
+ row.add(cate);
+ } else if (dataAll.get(col) == null) {
+ log.info(col + " is null");
+ row.add("");
+ } else if (dataAll.get(col).get(cate) == null) {
+ log.info(col + cate + " is null");
+ row.add("");
+ } else {
+ row.add(dataAll.get(col).get(cate));
+ }
}
exportData.add(row);
}
- log.info("column=" + JSONArray.toJSONString(column));
log.info("exportData.size=" + exportData.size());
ExcelUtils.write(response, "历史.xlsx", "历史数据", column, exportData);
}
--
Gitblit v1.9.3