From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +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 |   78 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 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 409434a..fe4005a 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,15 +3,16 @@
 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;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * @author PanZhibao
@@ -23,19 +24,80 @@
         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)
-                .eq("predicttime", predictTime);
+                .eq("predicttime", DateUtils.format(predictTime,timeFormat));
         MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
         if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
             return result;
         }
-        result = JSONArray.parseArray(data.getJsonvalue(), Object[].class);
-        result.forEach(item -> {
-            item[0] = new Date(Long.parseLong(item[0].toString()));
+        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), value};
+            calendar.add(Calendar.MINUTE, 1);
+            result.add(dv);
         });
         return result;
     }
+
+    @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 double[] getSimpleData(String outputId, Date predictTime, int predictLength) {
+        double[] result = new double[predictLength];
+        QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("outputid", outputId)
+                .eq("predicttime", DateUtils.format(predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+        MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
+        if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
+            return null;
+        }
+        List<Double> valueList = JSONArray.parseArray(data.getJsonvalue(), Double.class);
+        if (CollectionUtils.isEmpty(valueList)) {
+            return result;
+        }
+        for (int i = 0; i < predictLength; i++) {
+            result[i] = valueList.get(i);
+        }
+        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