From f70a481c8658ae60a1827486c81d6b37ad575b07 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 10:03:37 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 8d56568..5084b5b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -307,23 +307,42 @@
}
}
- String str = new DecimalFormat("#.######").format(Double.parseDouble(result.get("a21005").toString()));
+
QueryFiveDataByMacVO queryFiveDataByMacVO = new QueryFiveDataByMacVO();
queryFiveDataByMacVO.setName(device.getName());
queryFiveDataByMacVO.setDataTime(datas.get("dataTime").toString());
- queryFiveDataByMacVO.setA34004(result.get("a34004").toString());
- queryFiveDataByMacVO.setA34002(result.get("a34002").toString());
- queryFiveDataByMacVO.setA21026(result.get("a21026").toString());
- queryFiveDataByMacVO.setA21004(result.get("a21004").toString());
- queryFiveDataByMacVO.setA21005(str);
- queryFiveDataByMacVO.setA05024(result.get("a05024").toString());
- queryFiveDataByMacVO.setA01008(result.get("a01008").toString());
- queryFiveDataByMacVO.setA01007(result.get("a01007").toString());
- queryFiveDataByMacVO.setA99054(result.get("a99054").toString());
+ if (!ObjectUtils.isEmpty(result.get("a21005"))){
+ String str = new DecimalFormat("#.######").format(Double.parseDouble(result.get("a21005").toString()));
+ queryFiveDataByMacVO.setA21005(str);
+ }
+// queryFiveDataByMacVO.setA34004(result.get("a34004").toString());
+ queryFiveDataByMacVO.setA34004(ObjectUtils.isEmpty(result.get("a34004"))?null:result.get("a34004").toString());
+ queryFiveDataByMacVO.setA34002(ObjectUtils.isEmpty(result.get("a34002"))?null:result.get("a34002").toString());
+ queryFiveDataByMacVO.setA21026(ObjectUtils.isEmpty(result.get("a21026"))?null:result.get("a21026").toString());
+ queryFiveDataByMacVO.setA21004(ObjectUtils.isEmpty(result.get("a21004"))?null:result.get("a21004").toString());
+ queryFiveDataByMacVO.setA05024(ObjectUtils.isEmpty(result.get("a05024"))?null:result.get("a05024").toString());
+ queryFiveDataByMacVO.setA01008(ObjectUtils.isEmpty(result.get("a01008"))?null:result.get("a01008").toString());
+ queryFiveDataByMacVO.setA01007(ObjectUtils.isEmpty(result.get("a01007"))?null:result.get("a01007").toString());
+ queryFiveDataByMacVO.setA99054(ObjectUtils.isEmpty(result.get("a99054"))?null:result.get("a99054").toString());
return queryFiveDataByMacVO;
}
+
+ /**
+ * @Description: ������������������������mac���������
+ * @Param: [mac, startDate, endDate]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @Author: ���������
+ * @Date: 2021/9/23
+ */
+
+ @Override
+ public List<HistoryFiveMinutely> queryFiveMinutely(String mac, Date startDate, Date endDate) {
+ List<HistoryFiveMinutely> valueByMacAndTime = getValueByMacAndTime(mac, startDate, endDate);
+ return valueByMacAndTime;
+ }
+
//���������������������������������
private Map<String, Object> orderSixParam(Map<String, Object> data) {
LinkedHashMap result = new LinkedHashMap();
--
Gitblit v1.8.0