From a440ec3bfaa1363f5841100b8948d852971a2eb1 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 10 十二月 2024 13:19:58 +0800
Subject: [PATCH] MmPredictAlarmConfigService
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
index a953fe5..99455b0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
@@ -32,32 +32,6 @@
@Autowired
private MmItemResultDao mmItemResultDao;
-
- @Override
- public List<MmItemResultEntity> getListByOutputId(String outputid, Map<String, Object> params) {
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date startDateParam = null;
- try {
- startDateParam = sdf.parse((String)params.get("startTime"));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- Date endDateParam = null;
- try {
- endDateParam = sdf.parse((String)params.get("endTime"));
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- List<MmItemResultEntity> list = mmItemResultDao.selectList(
- new QueryWrapper<MmItemResultEntity>()
- .eq("outputid", outputid)
- .between("datatime", startDateParam, endDateParam)
- .orderByAsc("datatime")
- );
- return list;
- }
@Override
public void savePredictValue(Map<String, List<DataValueVO>> predictValueMap, int t, String nIndex, Date predictTime) {
@@ -101,7 +75,10 @@
resultJson.setId(UUID.randomUUID().toString());
resultJson.setOutputid(entry.getKey());
resultJson.setPredicttime(predictTime);
- resultJson.setJsonvalue(JSONArray.toJSONString(entry.getValue()));
+ List<Double> jsonValueList = entry.getValue().stream().map(valueVO -> {
+ return valueVO.getDataValue();
+ }).collect(Collectors.toList());
+ resultJson.setJsonvalue(JSONArray.toJSONString(jsonValueList));
Map<String, Object> map4 = new HashMap(2);
map4.put("TABLENAME", "T_MM_ITEM_RESULT_JSON");
map4.put("entity", resultJson);
@@ -143,7 +120,7 @@
}
@Override
- public List<Object[]> getData(String outputid, Date startTime, Date endTime) {
+ public List<Object[]> getData(String outputid, Date startTime, Date endTime, String timeFormat) {
List<Object[]> result = new ArrayList<>();
QueryWrapper<MmItemResultEntity> queryWrapper = new QueryWrapper<MmItemResultEntity>()
.eq("outputid", outputid)
@@ -155,8 +132,8 @@
}
list.forEach(item -> {
Object[] dataItem = new Object[2];
- dataItem[0] = DateUtils.format(item.getDatatime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- dataItem[1] = item.getDatavalue();
+ dataItem[0] = DateUtils.format(item.getDatatime(), timeFormat);
+ dataItem[1] = item.getDatavalue().setScale(2, BigDecimal.ROUND_HALF_UP);
result.add(dataItem);
});
return result;
--
Gitblit v1.9.3