From 5e8ae3bba1f8903ad74d8c154bae22fec8832d64 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 19 Jun 2020 16:24:54 +0800
Subject: [PATCH] 计算O3算法更新
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index c77ba4c..8af56a4 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -12,12 +12,6 @@
import javax.annotation.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -33,6 +27,12 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
@Component
public class HistoryTableInsertTask {
@@ -356,12 +356,12 @@
public ReturnT insertHistoryO3Table(String params) {
Map macMap = JSON.parseObject(params);
List<String> macList = (List<String>) macMap.get("mac");
- String temperatureRatio = macMap.get("temperatureRatio").toString();
String illuminationRatio = macMap.get("illuminationRatio").toString();
String pressureRatio1 = macMap.get("pressureRatio1").toString();
String pressureRatio2 = macMap.get("pressureRatio2").toString();
- String humidityRatio = macMap.get("humidityRatio").toString();
String windSpeedRatio = macMap.get("windSpeedRatio").toString();
+ BigDecimal temperatureRatio;
+ BigDecimal humidityRatio;
LocalDateTime time = LocalDateTime.now();
LocalDateTime value = time.truncatedTo(ChronoUnit.HOURS);
LocalDateTime illuminationTime = value.minusHours(1);
@@ -421,10 +421,14 @@
} else {
illumination = new BigDecimal("0");
}
- BigDecimal bignum1 = temperature.multiply(new BigDecimal(temperatureRatio));
- BigDecimal bignum2 = illumination.divide(new BigDecimal(illuminationRatio));
+ temperatureRatio = new BigDecimal("8").add(new BigDecimal("32").divide(temperature.subtract(new BigDecimal("12")), 4, BigDecimal.ROUND_HALF_UP));
+ BigDecimal bignum1 = temperature.multiply(temperatureRatio);
+ BigDecimal bignum2 = illumination.divide(new BigDecimal(illuminationRatio), 4, BigDecimal.ROUND_HALF_UP);
BigDecimal bignum3 = new BigDecimal(pressureRatio1).divide(pressure.subtract(new BigDecimal(pressureRatio2)), 4, BigDecimal.ROUND_HALF_UP);
- BigDecimal bignum4 = humidity.multiply(new BigDecimal(humidityRatio));
+ BigDecimal index = humidity.subtract(new BigDecimal("100")).divide(new BigDecimal("50"), 4, BigDecimal.ROUND_HALF_UP);
+ double indexDouble = Math.pow(0.8, index.doubleValue());
+ humidityRatio = new BigDecimal("1").add(BigDecimal.valueOf(indexDouble));
+ BigDecimal bignum4 = humidity.multiply(humidityRatio);
BigDecimal bignum5 = windSpeed.multiply(new BigDecimal(windSpeedRatio));
BigDecimal result = bignum1.add(bignum2).add(bignum3).subtract(bignum4).subtract(bignum5).setScale(4, BigDecimal.ROUND_HALF_UP);
jo.put("e15", result);
--
Gitblit v1.8.0