From c4b37d26df82e2988e4784d847ff75102c2121c4 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 25 十二月 2024 15:30:53 +0800 Subject: [PATCH] 预测项输入特殊处理double类型 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 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..8520d31 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,13 +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.Calendar; import java.util.Date; import java.util.List; @@ -23,19 +26,35 @@ 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 String getDoubleData(String outputId, Date predictTime) { + QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>(); + wrapper.eq("outputid", outputId) + .eq("predicttime", predictTime); + MmItemResultJsonEntity mmItemResultJsonEntity = baseDao.selectOne(wrapper); + return null == mmItemResultJsonEntity ? null : mmItemResultJsonEntity.getCumulant(); + } } \ No newline at end of file -- Gitblit v1.9.3