From 7d76b9e89baa29a1ae2e5e406d6d11dcca15325a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:25:11 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
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 4b5dea2..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);
//������������
@@ -107,9 +110,15 @@
}
if (code.equals("2")){
HashMap<String, Object> result = new HashMap<>();
- String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
+ String time1 = deviceData.get("time").toString();
+ long l = Long.parseLong(time1);
+
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
- String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
+ String format1 = simpleDateFormat.format(l);
+ Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(date, -2), DateUtils.yyyyMM_EN);
+ String format = simpleDateFormat.format(DateUtils.addHours(date, -2));
result.put("timeUnits",yearAndMonth);
result.put("mac",mac);
result.put("time",format);
--
Gitblit v1.8.0