From 7ec8705d416b06db5d68b43d5c8cf83713e2d156 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 06 五月 2025 16:19:17 +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/api/controller/admin/PowerController.java | 4 ++--
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java | 6 +++---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 29 +++++++++++++++++------------
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 ++-
doc/鞍钢数据接口文档_master.doc | 0
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java | 5 +++--
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceSuggestService.java | 2 +-
10 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index 535c830..abe2985 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -850,7 +850,7 @@
}
for (String code : dto.getCodeList()) {
- PowerDemandEntity powerDemand = powerDemandService.getByCode(dto.getCode());
+ PowerDemandEntity powerDemand = powerDemandService.getByCode(code);
if (powerDemand == null) {
log.info("未找到code对应的数据: {}", dto.getCode());
return success(new LinkedHashMap<>());
@@ -874,7 +874,7 @@
query.setPointNo(pointNo);
query.setStart(startTime);
query.setEnd(endTime);
- log.info("开始查询实测需量/有功功率历史数据，测点: {}", pointNo);
+ log.info("开始查询实测需量有功功率历史数据，测点: {}", pointNo);
List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(query);
List<Object[]> dataList = chartData.stream()
.map(pv -> new Object[]{
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 ae19b06..03d7f3a 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
@@ -113,9 +113,9 @@
@Override
public List<MainProcessIndexDTO> getIndexList(Map<String, Object> params) {
List<MainProcessIndexDTO> list = new ArrayList<>();
- if("day".equals(params.get("type"))) {
+ if ("day".equals(params.get("type"))) {
list = ConvertUtils.sourceToTarget(mainProcessIndexDayDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class);
- }else if("team".equals(params.get("type"))){
+ } else if ("team".equals(params.get("type"))) {
list = ConvertUtils.sourceToTarget(mainProcessIndexTeamDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class);
}
if (!CollectionUtils.isEmpty(list)) {
@@ -188,9 +188,12 @@
PreDataSingleChartRespVO resultOld = mcsApi.getPreDataSingleChart(reqVO);
PreDataChartRespVO result = ConvertUtils.sourceToTarget(resultOld, PreDataChartRespVO.class);
PreDataViewDTO preDataView = ConvertUtils.sourceToTarget(resultOld.getDataView(), PreDataViewDTO.class);
- if(trendsDataH != null) {
+ if (StringUtils.isNotBlank(trendsDataH)) {
+ // 动态上限
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
pointValueQueryDTO.setPointNo(trendsDataH);
+ pointValueQueryDTO.setStart(startTime);
+ pointValueQueryDTO.setEnd(endTime);
List<ApiPointValueDTO> trendsDataHList = ConvertUtils.sourceToTarget(dataPointApi.queryPointHistoryValue(pointValueQueryDTO), ApiPointValueDTO.class);
List<Object[]> newList = new ArrayList<>();
trendsDataHList.forEach(item -> {
@@ -201,9 +204,12 @@
});
preDataView.setTrendsDataH(newList);
}
- if(trendsDataL != null) {
+ if (StringUtils.isNotBlank(trendsDataL)) {
+ // 动态下限
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
pointValueQueryDTO.setPointNo(trendsDataL);
+ pointValueQueryDTO.setStart(startTime);
+ pointValueQueryDTO.setEnd(endTime);
List<ApiPointValueDTO> trendsDataLList = ConvertUtils.sourceToTarget(dataPointApi.queryPointHistoryValue(pointValueQueryDTO), ApiPointValueDTO.class);
List<Object[]> newList = new ArrayList<>();
trendsDataLList.forEach(item -> {
@@ -216,7 +222,6 @@
}
preDataView.setPreData(resultOld.getDataView().getPreDataL());
-
result.setPreDataView(preDataView);
return result;
}
@@ -252,7 +257,7 @@
}
/**
- * 查询原始计划、修正计划数据
+ * 查询原始计划、修正计划数据
*/
@Override
public Map<String, Object> getPlanDataChart(PlanDataChartReqVO reqVO) {
@@ -393,16 +398,16 @@
Date endTime = null;
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
- if (params.containsKey("endTime")) {
- endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- }else {
+ if (!params.containsKey("endTime") || StringUtils.isBlank(params.get("endTime").toString())) {
endTime = calendar.getTime();
- }
- if (params.containsKey("startTime")) {
- startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}else {
+ endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ }
+ if (!params.containsKey("startTime") || StringUtils.isBlank(params.get("startTime").toString())) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
startTime = calendar.getTime();
+ }else {
+ startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
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/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 046aeba..8b23ef0 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