From ca56f2da24aa48464b5aa23fb96162e213eeb4fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 11 二月 2025 14:43:27 +0800
Subject: [PATCH] 数据分析接口修改
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 25 +++++++++++++++++++++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java | 1 +
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmItemResultJsonService.java | 2 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 5 +++--
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemTreeDTO.java | 2 ++
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemTreeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemTreeDTO.java
index eee163a..3bb959c 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemTreeDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictItemTreeDTO.java
@@ -18,5 +18,7 @@
private String label;
+ private Boolean disabled = false;
+
private List<PredictItemTreeDTO> children;
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 87cbea9..2750fc1 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -127,6 +127,7 @@
PredictItemTreeDTO moduleOpt = new PredictItemTreeDTO();
moduleOpt.setId(item.getId());
moduleOpt.setLabel(item.getModulename());
+ moduleOpt.setDisabled(true);
List<PredictItemTreeDTO> children = new ArrayList<>();
List<ItemVO> itemList = mmPredictItemService.getByModuleId(item.getId());
itemList.forEach(item1 -> {
@@ -170,7 +171,7 @@
break;
}
}
- ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
+ ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
if (predictItem.getLastTime() != null) {
predictTime = predictItem.getLastTime();
} else {
@@ -210,7 +211,7 @@
viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, 3));
List<Double> values = new ArrayList<>();
if (!CollectionUtils.isEmpty(viewDto.getRealData())) {
List<Double> hisValues = new ArrayList<>();
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmItemResultJsonService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmItemResultJsonService.java
index 5df7b12..a93f01b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmItemResultJsonService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmItemResultJsonService.java
@@ -16,6 +16,8 @@
List<Object[]> getData(String outputId, Date predictTime, String timeFormat);
+ List<Object[]> getData(String outputId, Date predictTime, String timeFormat, int scale);
+
void insert(List<MmItemResultJsonEntity> resultJsonList);
void cleanResultJson(Map<String, Date> tMap);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
index 9d4fa38..795640d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
@@ -28,6 +28,7 @@
ItemVO getItemByItemNo(String itemNo);
ItemVO getItemByIdFromCache(String itemId);
+
ItemVO getItemById(String itemId);
ItemVO getItemByOutPutId(String outPutId);
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 d2d988f..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,6 +11,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -47,6 +48,30 @@
}
@Override
+ 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", 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);
}
--
Gitblit v1.9.3