From eb23bc41da0a27d1aada95744e0262e8cb4f0385 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 16:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 3 ++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 3 ++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java | 6 +++---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java | 3 ++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java | 3 ++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java | 5 +++--
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java | 8 +++++---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java | 2 +-
8 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java
index da91d79..c0db4a1 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java
@@ -21,5 +21,5 @@
List<CokingTraceSuggestEntity> getAbnormalData(Map<String, Object> params);
- void saveTraceSuggest(String relId, String process, String clock, String total, String sugObj);
+ void saveTraceSuggest(String relId, String process, String clock, String content, String sugObj);
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
index 2df5eaa..57750ae 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -77,12 +78,12 @@
List<String> points = new ArrayList<>();
points.add(conf.getPointNo());
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- value = pointsRealValue.get(conf.getPointNo()).toString();
+ value = new BigDecimal(pointsRealValue.get(conf.getPointNo()).toString()).setScale(2,BigDecimal.ROUND_HALF_UP) .toString();
break;
case IND:
List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());
if (!CollectionUtils.isEmpty(indValues)) {
- value = indValues.get(indValues.size() - 1).getDataValue().toString();
+ value = new BigDecimal(indValues.get(indValues.size() - 1).getDataValue().toString()).setScale(2,BigDecimal.ROUND_HALF_UP) .toString();
}
break;
default:
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
index d9099e3..7059108 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
@@ -66,8 +66,8 @@
}
@Override
- public void saveTraceSuggest(String relId, String process, String clock, String total, String sugObj) {
- if (StringUtils.isBlank(total)) {
+ public void saveTraceSuggest(String relId, String process, String clock, String content, String sugObj) {
+ if (StringUtils.isBlank(content)) {
return;
}
CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
@@ -75,7 +75,7 @@
suggestEntity.setProcess(process);
suggestEntity.setSugObj(sugObj);
suggestEntity.setClock(clock);
- suggestEntity.setContent(total);
+ suggestEntity.setContent(content);
suggestEntity.setCreateDate(new Date());
cokingTraceSuggestDao.insert(suggestEntity);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
index 4d1e8da..e41b3e4 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
@@ -116,13 +116,14 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
String analyContent = clock + " " + result.getString("coalHomeIndexInfo");
+ String content = result.getString(total);
String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, total, SugObj);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, content, SugObj);
// 保存偏差值
cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
index e5575cf..0356531 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
@@ -114,13 +114,14 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
String analyContent = clock + " " + result.getString("steamHomeIndexInfo");
+ String content = result.getString(total);
String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, total, SugObj);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, content, SugObj);
// 保存偏差值
cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 5af3c23..14a0b7c 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -105,13 +105,14 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
String analyContent = clock + " " + result.getString("chemProdHomeIndexInfo");
+ String content = result.getString(total);
String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, total, SugObj);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, content, SugObj);
// 保存偏差值
cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
index ad56470..b99336f 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
@@ -105,13 +105,14 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
String analyContent = clock + " " + result.getString("cokeHomeIndexInfo");
+ String content = result.getString(total);
String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, total, SugObj);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, content, SugObj);
// 保存偏差值
cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
index 4cb978d..91e7370 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
@@ -53,6 +53,7 @@
//计算昨日总电耗
Calendar cal = (Calendar) calendar.clone();
cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.HOUR_OF_DAY, 0);
Date endTime = calendar.getTime();
@@ -72,11 +73,11 @@
//下发昨日峰/谷累积量
ApiPointValueWriteDTO totalDto = new ApiPointValueWriteDTO();
percentDto.setPointNo(entry.getValue().get(0).getPointNoTotal());
- percentDto.setValue(value);
+ percentDto.setValue(totalValue);
dataPointApi.writePointRealValue(totalDto);
//计算前三十日峰/谷累积量
- double valueMonth = getSumValueTotal(entry.getValue().get(0).getPointNoTotal(), monthStartTime, endTime);
+ double valueMonth = getSumValueTotal(entry.getValue().get(0).getPointNoTotal(), monthStartTime, startTime)+totalValue;
//计算前三十日总电耗
double totalValueMonth = getSumValueTotal(entry.getValue().get(0).getPowerNo(), monthStartTime, endTime);
@@ -86,8 +87,8 @@
monthDto.setPointNo(entry.getValue().get(0).getPointNoMonth());
double percentMonth = totalValueMonth == 0 ? 0 : valueMonth / totalValueMonth * 100;
monthDto.setValue(percentMonth);
+ logger.info("name:"+entry.getValue().get(0).getName()+";value:"+value+";valueMonth:"+valueMonth+";totalValueMonth:"+totalValueMonth);
dataPointApi.writePointRealValue(monthDto);
-
});
} catch (Exception ex) {
logger.error("runPeakValleyFlatTask运行异常", ex);
@@ -102,6 +103,7 @@
}
//根据配置获取startTime、endTime
cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.SECOND, 0);
cal.set(Calendar.HOUR_OF_DAY, Integer.parseInt(timeSplit[0]));
cal.set(Calendar.MINUTE, Integer.parseInt(timeSplit[1]));
cal.add(Calendar.DAY_OF_YEAR, -ago);
--
Gitblit v1.9.3