From 52725f177acbe4ccf6b1fab059353890c4b55814 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 18 三月 2025 09:13:36 +0800
Subject: [PATCH] 样本构建修改
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index a08edd1..f6fd187 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -200,6 +200,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
calendar.add(Calendar.HOUR_OF_DAY, 1);
+ calendar.add(Calendar.MINUTE, 1);
endTime = calendar.getTime();
}
@@ -722,9 +723,11 @@
}
MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]);
String outputId = outPut.getId();
- // 如果第5个参数为1，则取累计值
- if ("1".equals(itemNo[4])){
- outputId = outPut.getId() + CommonDict.CUMULANT_SUFFIX;
+ // 判断是否有第五个参数，如果有第5个参数为1，则取累计值
+ if (itemNo.length >= 5){
+ if (StringUtils.isNotBlank(itemNo[4]) && "1".equals(itemNo[4])){
+ outputId = outPut.getId() + CommonDict.CUMULANT_SUFFIX;
+ }
}
Date predictTime = predictItem.getLastTime();
List<Object[]> curData = mmItemResultJsonService.getData(outputId, predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
@@ -843,22 +846,6 @@
});
chartParamService.updateByChartIdAndParamCode(chartParams);
return true;
- }
-
- /**
- * 计算功率因数 p²/（根号：p²+Q²）
- **/
- public Double calculateCos(Double PValue,Double QValue) {
- // 绝对值
- PValue = Math.abs(PValue);
- QValue = Math.abs(QValue);
- //PValue [0,0.001] 直接判断为关闭返回0
- if (PValue >= 0 && PValue <= 0.001) {
- return 0.0;
- }else {
- BigDecimal result = new BigDecimal(PValue).divide(BigDecimal.valueOf(Math.sqrt(Math.pow(PValue, 2) + Math.pow(QValue, 2))), 2, BigDecimal.ROUND_HALF_UP);
- return result.doubleValue();
- }
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
--
Gitblit v1.9.3