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/MmItemResultJsonServiceImpl.java | 5 +++--
1 files changed, 3 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 ab3a581..165328f 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.mcs.pre.dao.MmItemResultJsonDao;
import com.iailab.module.model.mcs.pre.entity.MmItemResultJsonEntity;
import com.iailab.module.model.mcs.pre.service.MmItemResultJsonService;
@@ -25,7 +26,7 @@
implements MmItemResultJsonService {
@Override
- public List<Object[]> getData(String outputId, Date predictTime) {
+ public List<Object[]> getData(String outputId, Date predictTime, String timeFormat) {
List<Object[]> result = new ArrayList<>();
QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
wrapper.eq("outputid", outputId)
@@ -41,7 +42,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
valueList.forEach(value -> {
- Object[] dv = { calendar.getTime(), value};
+ Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), value};
calendar.add(Calendar.MINUTE, 1);
result.add(dv);
});
--
Gitblit v1.9.3