From 154b38709aa8151222382240392f120ae5542a69 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 18 二月 2025 15:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 4f7c1fa..ecb19ba 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
@@ -11,10 +11,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* @author PanZhibao
@@ -50,16 +48,36 @@
}
@Override
- public String getDoubleData(String outputId, Date predictTime) {
+ public List<Object[]> getData(String outputId, Date predictTime, String timeFormat, int scale) {
+ List<Object[]> result = new ArrayList<>();
QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
wrapper.eq("outputid", outputId)
- .eq("predicttime", predictTime);
- MmItemResultJsonEntity mmItemResultJsonEntity = baseDao.selectOne(wrapper);
- return null == mmItemResultJsonEntity ? null : mmItemResultJsonEntity.getCumulant();
+ .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);
+ 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);
+ });
+ return result;
}
@Override
public void insert(List<MmItemResultJsonEntity> resultJsonList) {
baseDao.insertBatch(resultJsonList);
}
+
+ @Override
+ public void cleanResultJson(Map<String, Date> tMap) {
+ baseDao.cleanResultJson(tMap);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3