From 56c701ab19eb16ebf2f75bdd42b4ea9da1c2a733 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 25 六月 2025 14:19:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 2 +-
ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java | 2 +-
doc/鞍钢数据接口文档_master.doc | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index a2f072a..6601abd 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -535,7 +535,7 @@
preDataBarLineRespVO.getDataViewList().forEach(item -> {
PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
preDataViewSimpleDTO.setItemName(item.getResultName());
- preDataViewSimpleDTO.setPredictTime(item.getPredictTime());
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
preDataViewSimpleDTO.setCurData(item.getCurData());
preDataViewSimpleDTO.setRealData(item.getRealData());
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
index 0fa5004..3f56516 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
@@ -57,7 +57,7 @@
PreDataViewRespDTO result = resultMap.get(config.getOutId());
PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
preDataViewSimpleDTO.setItemName(config.getOutName());
- preDataViewSimpleDTO.setPredictTime(result.getPredictTime());
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
preDataViewSimpleDTO.setLineType(config.getLineType());
preDataViewSimpleDTO.setCurData(result.getCurData());
diff --git "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc" "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
index dce6f04..43f2e4b 100644
--- "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
+++ "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
Binary files differ
--
Gitblit v1.9.3