From ffe9d36074938e837f46afcd30b99788a7fbb4a0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 04 Mar 2022 16:02:40 +0800
Subject: [PATCH] 烟气流速，流量校准
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 64 ++++++++++++++++++++++++++++++++
screen-manage/src/main/resources/application-dev.yml | 4 +-
screen-common/src/main/java/com/moral/constant/Constants.java | 10 +++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index bed1b1d..5e7f627 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -135,6 +135,16 @@
public static final String SENSOR_CODE_VOCS = "a99054";
/*
+ * ������������ code
+ * */
+ public static final String SENSOR_CODE_CURRENT_SPEED = "a01011";
+
+ /*
+ * ������������ code
+ * */
+ public static final String SENSOR_CODE_CURRENT_FLOW = "a40001";
+
+ /*
* ������code
* */
public static final String SENSOR_CODE_TEMP = "a01001";
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index d1d059b..c17d2c5 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -31,6 +31,12 @@
try {
Date time = DateUtils.getDate((String) deviceData.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
long finalTime = DateUtils.dataToTimeStampTime(time, DateUtils.HH_mm_ss_EN).getTime();
+
+ //������������������������������������������������������
+ if (deviceData.get(Constants.SENSOR_CODE_CURRENT_SPEED) != null) {
+ deviceData = adjustFlueSpeedAndFlow(deviceData, adjustFormula);
+ }
+
for (String key : deviceData.keySet()) {
if (!key.contains("Flag")) {
//���������
@@ -85,4 +91,62 @@
}
return deviceData;
}
+
+ /**
+ * ���������������������������������
+ * @param deviceData ���������������������������������������������������������������������������������������������������������
+ * @param adjustFormula ���������������������������������������������������key���������code
+ */
+ public Map<String, Object> adjustFlueSpeedAndFlow(Map<String, Object> deviceData, Map<String, Object> adjustFormula) {
+ Date time = DateUtils.getDate((String) deviceData.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ long finalTime = DateUtils.dataToTimeStampTime(time, DateUtils.HH_mm_ss_EN).getTime();
+ //���������������
+ Object measuredValue = deviceData.get(Constants.SENSOR_CODE_CURRENT_SPEED);
+
+
+ //������������
+ List<DeviceAdjustValue> speedFormulas = (List<DeviceAdjustValue>) adjustFormula.get(Constants.SENSOR_CODE_CURRENT_SPEED);
+ if (!ObjectUtils.isEmpty(speedFormulas)) {
+ //���������������������������������
+ DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
+ Optional<DeviceAdjustValue> optional = speedFormulas.stream()
+ .filter(o -> o.getStartTime().getTime() <= finalTime && o.getEndTime().getTime() > finalTime)
+ .findFirst();
+ if (optional.isPresent()) {
+ deviceAdjustValue = optional.get();
+ }
+
+ String formula = deviceAdjustValue.getValue();
+ if (!StringUtils.isEmpty(formula)) {
+
+ Expression expression = AviatorEvaluator.compile(formula);
+ Map<String, Object> env = new HashMap<>();
+ env.put("cel", Float.parseFloat((String) measuredValue));
+ //������
+ measuredValue = expression.execute(env);
+ deviceData.put(Constants.SENSOR_CODE_CURRENT_SPEED, Double.parseDouble(String.format("%.4f", measuredValue)));
+ }
+
+
+ //������������
+ List<DeviceAdjustValue> flowFormulas = (List<DeviceAdjustValue>) adjustFormula.get(Constants.SENSOR_CODE_CURRENT_FLOW);
+ //���������������������������������
+ optional = flowFormulas.stream()
+ .filter(o -> o.getStartTime().getTime() <= finalTime && o.getEndTime().getTime() > finalTime)
+ .findFirst();
+ if (optional.isPresent()) {
+ deviceAdjustValue = optional.get();
+ }
+
+ formula = deviceAdjustValue.getValue();
+ if (!StringUtils.isEmpty(formula)) {
+ Expression expression = AviatorEvaluator.compile(formula);
+ Map<String, Object> env = new HashMap<>();
+ String currentSpeed = deviceData.get(Constants.SENSOR_CODE_CURRENT_SPEED).toString();
+ env.put("currentSpeed", Float.parseFloat(currentSpeed));
+ deviceData.put(Constants.SENSOR_CODE_CURRENT_FLOW, Double.parseDouble(String.format("%.4f", expression.execute(env))));
+ }
+ }
+ return deviceData;
+ }
}
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 33a65fe..62d8fcf 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -106,8 +106,8 @@
retries: 0
servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
- insert: insert
- state: state
+ insert: Dev_insert
+ state: Dev_state
mvc:
interceptor:
exclude:
--
Gitblit v1.8.0