From 6ea8bed0c8cb5d786a48bdbe4edfdb7cc13555e3 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 21 四月 2025 19:23:19 +0800
Subject: [PATCH] 查询指标历史值分页
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
index fe4005a..4e44b5f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
@@ -29,7 +29,11 @@
QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
wrapper.eq("outputid", outputId)
.eq("predicttime", DateUtils.format(predictTime,timeFormat));
- MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
+ MmItemResultJsonEntity data = null;
+ List<MmItemResultJsonEntity> dataList = baseDao.selectList(wrapper);
+ if (!CollectionUtils.isEmpty(dataList)) {
+ data = dataList.get(0);
+ }
if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
return result;
}
@@ -40,8 +44,8 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
valueList.forEach(value -> {
- Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), value};
calendar.add(Calendar.MINUTE, 1);
+ Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), value};
result.add(dv);
});
return result;
@@ -64,6 +68,38 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
valueList.forEach(value -> {
+ calendar.add(Calendar.MINUTE, 1);
+ Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), new BigDecimal(value).setScale(scale, BigDecimal.ROUND_HALF_UP)};
+ result.add(dv);
+ });
+ return result;
+ }
+
+ @Override
+ public List<Object[]> getData(String outputId, Date predictTime, String timeFormat, int scale, Boolean isT1, Object curReal) {
+ List<Object[]> result = new ArrayList<>();
+ QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("outputid", outputId)
+ .eq("predicttime", DateUtils.format(predictTime,timeFormat));
+ MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
+ if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
+ return result;
+ }
+ List<Double> valueList = JSONArray.parseArray(data.getJsonvalue(), Double.class);
+ if (CollectionUtils.isEmpty(valueList)) {
+ return result;
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictTime);
+ if (isT1) {
+ Object[] v0 = new Object[2];
+ v0[0] = DateUtils.format(calendar.getTime(), timeFormat);
+ v0[1] = curReal;
+ result.add(v0);
+ calendar.add(Calendar.MINUTE, 1);
+ }
+
+ valueList.forEach(value -> {
Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), new BigDecimal(value).setScale(scale, BigDecimal.ROUND_HALF_UP)};
calendar.add(Calendar.MINUTE, 1);
result.add(dv);
--
Gitblit v1.9.3