From 8c25ec148726a58ca433f1b98407f79875d50a79 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:12:00 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 25 +++++++++++++++----------
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 5 ++++-
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 9 ++++-----
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 8 ++------
4 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index c2be6d5..ccc1fb0 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,4 +1,3 @@
-/*
package com.moral.api.exception.consumer;
@@ -28,10 +27,8 @@
import com.moral.constant.KafkaConstants;
-*/
-/*
- * ������������������������
- * *//*
+/* * ������������������������
+ **/
@Component
@@ -121,4 +118,3 @@
}
}
-*/
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 536c6f0..7b5cbe7 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -1,4 +1,3 @@
-/*
package com.moral.api.exception.consumer;
@@ -25,14 +24,15 @@
import java.util.concurrent.CopyOnWriteArraySet;
-*/
-/**
+/*
+*
* @ClassName SecondsDataConsumer1
* @Description TODO
* @Author ���������
* @Date 2021/6/15 14:49
* @Version TODO
- **//*
+ *
+*/
@Component
@@ -123,4 +123,3 @@
}
-*/
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 2f01807..c28c617 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -875,27 +875,32 @@
@Override
public boolean historyHourly() {
+ String time = "2023-08-16 21:00:00";
+ String table = "202308";
+
+ String timeEnd = "2023-08-17 00:00:00";
+ String tableEnd = "202308";
List<String> macList = Arrays.asList("p5dnd7a0245406","p5dnd7a0245427","p5dnd7a0245412","p5dnd7a0245400","p5dnd7a0245472","p5dnd7a0245384","p5dnd7a0245374","p5dnd7a0245401","p5dnd7a0245423","p5dnd7a0245438","p5dnd7a0245363","p5dnd7a0245375","p5dnd7a0245444","p5dnd7a0245437","p5dnd7a0245367","p5dnd7a0245392","p5dnd7a0245471","p5dnd7a0245433","p5dnd7a0245361","p5dnd7a0245362","p5dnd7a0245436","p5dnd7a0245373","p5dnd7a0245370","p5dnd7a0245357","p5dnd7a0245434","p5dnd7a0245353","p5dnd7a0245381","p5dnd7a0245421","p5dnd7a0245399","p5dnd7a0245409","p5dnd7a0245422","p5dnd7a0245470","p5dnd7a0245359","p5dnd7a0245393","p5dnd7a0245371","p5dnd7a0245382","p5dnd7a0245385","p5dnd7a0245443","p5dnd7a0245424","p5dnd7a0245369","p5dnd7a0245389","p5dnd7a0245391","p5dnd7a0245356","p5dnd7a0245396","p5dnd7a0243567","p5dnd7a0243568");
- List<Map<String,Object>> listMap = historyHourlyMapper.selectDataByMacsAndTime("202308", macList, "2023-08-11 20:00:00");
+ List<Map<String,Object>> listMap = historyHourlyMapper.selectDataByMacsAndTime(table, macList, time);
for (Map historyHourlyData : listMap) {
String mac = historyHourlyData.get("mac").toString();
Map<String, Object> data = JSON.parseObject(historyHourlyData.get("value").toString(), Map.class);
Map<String, Object> dataResult = new HashMap<>();
dataResult = data;
- dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())+5);
- dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())+10);
- dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())+10);
- dataResult.put("a21005",Double.parseDouble(data.get("a21005").toString())+0.1);
- dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())-20);
+ dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())+3);
+ dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())+3);
+ dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())+4);
+ dataResult.put("a21005",Double.parseDouble(data.get("a05024").toString())-35);
+ /* dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())-20);
dataResult.put("a01002",Double.parseDouble(data.get("a01002").toString())+2);
- dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.05);
+ dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.05);*/
Map<String, Object> map = new HashMap<>();
- map.put("timeUnits",202308);
- map.put("time","2023-08-11 21:00:00");
+ map.put("timeUnits",tableEnd);
+ map.put("time",timeEnd);
map.put("value",JSONObject.toJSONString(dataResult));
map.put("version","35");
map.put("mac",mac);
- //historyHourlyMapper.insertHistoryHourly(map);
+ historyHourlyMapper.insertHistoryHourly(map);
}
return true;
}
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 021bf30..eda029a 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
@@ -92,10 +92,13 @@
Object vocsValue = ObjectUtils.isEmpty(deviceData.get(Constants.SENSOR_CODE_VOCS)) ? 0F : deviceData.get(Constants.SENSOR_CODE_VOCS);
env.put("vocs", vocsValue);
}
- if (formula.contains("cel")) {
+ if (formula.contains("ce1")) {
//env.put("cel", Float.parseFloat((String) measuredValue));
+ env.put("ce1", new BigDecimal(String.valueOf(measuredValue)).floatValue());
+ }else if(formula.contains("cel")){
env.put("cel", new BigDecimal(String.valueOf(measuredValue)).floatValue());
}
+
//������
measuredValue = expression.execute(env);
//������������
--
Gitblit v1.8.0