From 0f3d78af0ad9a2c2471f4321dc55a651d84ad3d8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 16 四月 2025 14:58:23 +0800
Subject: [PATCH] getData

---
 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictLastValueReqVO.java                |    2 ++
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictLastValueReqVO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictLastValueReqVO.java
index cd96bee..8d6a6c1 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictLastValueReqVO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PredictLastValueReqVO.java
@@ -1,5 +1,6 @@
 package com.iailab.module.model.api.mcs.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,5 +18,6 @@
 
     private List<String[]> itemNos;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date predictTime;
 }
\ No newline at end of file
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 39478f2..4e44b5f 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
@@ -29,7 +29,11 @@
         QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("outputid", outputId)
                 .eq("predicttime", DateUtils.format(predictTime,timeFormat));
-        MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
+        MmItemResultJsonEntity data = null;
+        List<MmItemResultJsonEntity> dataList = baseDao.selectList(wrapper);
+        if (!CollectionUtils.isEmpty(dataList)) {
+            data = dataList.get(0);
+        }
         if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
             return result;
         }

--
Gitblit v1.9.3