From 5a46fc75e47ce9a838270024da24405f9673b814 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 15:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
index 2829eaa..c276401 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
@@ -88,16 +88,15 @@
if (!params.containsKey("datas") || StringUtils.isBlank(params.get("datas").toString())) {
return success(result);
}
- log.info("datas:" + params.get("datas").toString());
- JSONArray jsonArray = JSON.parseArray(params.get("datas").toString());
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(params.get("datas")));
for (Object data : jsonArray) {
Map<String, Object> param = new HashMap<>();
- JSONObject jsonObject = JSON.parseObject(data.toString());
+ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(data));
param.put("dataType",jsonObject.get("dataType"));
param.put("dataNo",jsonObject.get("dataNo"));
param.put("startTime",params.get("startTime"));
param.put("endTime",params.get("endTime"));
- List<Object[]> historyValue = dataService.getHistoryValue(params);
+ List<Object[]> historyValue = dataService.getHistoryValue(param);
result.put(jsonObject.get("dataNo").toString(),historyValue);
}
return success(result);
--
Gitblit v1.9.3