From 1ef1640c9eebf928b28befa55c5f3e3f8fece4b9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Feb 2024 10:12:59 +0800
Subject: [PATCH] fix:代码优化测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 40b13b6..5494430 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
@@ -191,7 +191,21 @@
}
return getWindData(windData,params);
}
+ @Override
+ public List<Object> getAreaWindDataCenter(Map<String, Object> params) {
+// String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
+// params.put("timeUnits", timeUnits);
+// //������������
+// List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);
+// return getWindData(windData);
+ params.put("timeUnits","202311");
+ params.put("time","2023-11-05 09:00");
+ params.put("macs",Arrays.asList("p5dnd7a0245472","p5dnd7a0245400","p5dnd7a0245385","p5dnd7a0245374"));
+ List<WindData> windData = historyHourlyMapper.getArea(params);
+ params.put("perdlen",50);
+ return getWindData(windData,params);
+ }
//���������������������������
@Override
@@ -293,19 +307,23 @@
}
}
- 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;
}
@@ -462,7 +480,7 @@
laLaMap.put("minLa", lami);
- int perdlen = windDate(Objects.nonNull(params.get("monitorPointList"))?params.get("monitorPointList").toString():null);
+ int perdlen = Objects.nonNull(params.get("perdlen"))?Integer.parseInt(params.get("perdlen").toString()):windDate(Objects.nonNull(params.get("monitorPointList"))?params.get("monitorPointList").toString():null);
int length = perdlen*10;
Double lo1 = lomi - length * 0.00001141;
--
Gitblit v1.8.0