From 4107073950f459e051e5b9e828750ab57be3863b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 16:03:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 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 fb92312..40b13b6 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
@@ -17,6 +17,7 @@
import com.moral.api.pojo.ext.wind.WindListExt;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
+import com.moral.api.pojo.vo.historyFiveMinutely.QueryFiveDataByMacVO;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryFiveMinutelyService;
@@ -38,6 +39,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -234,7 +236,12 @@
data = data + " " + sensor.getShowUnit();
result.put(sensor.getCode(), data);
} else {
- result.put(sensor.getCode(), "-");
+ if (sensor.getCode().equals("a01008") ||sensor.getCode().equals("a01007")){
+ result.put(sensor.getCode(), "-");
+ }else {
+ result.put(sensor.getCode(), "0"+" "+sensor.getShowUnit());
+ }
+
}
}
//������������������
@@ -245,6 +252,64 @@
return orderSixParam(result);
}
+ @Override
+ public QueryFiveDataByMacVO queryFiveDataByMac(String mac, String chooseTime, String time) {
+ Map<String, Object> datas = null;
+ if (chooseTime.equals("true")) {
+ String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
+ String dbDataStr = historyHourlyMapper.queryLastHourlyMac(mac, time, timeUnits);
+ if (dbDataStr == null) {
+ return null;
+ }
+ datas = JSON.parseObject(dbDataStr, HashMap.class);
+ datas.put("dataTime", time);
+ } else {
+ datas = queryLastDataByMac(mac);
+ if (ObjectUtils.isEmpty(datas)){
+ return null;
+ }
+ }
+ //������������������
+ Map<String, Object> result = new HashMap<>();
+
+ //������������������code������
+ List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054", "a01008", "a01007");
+ //������������������
+ Device device = deviceService.getDeviceUnitAlramInforByMac(mac);
+ //���������������������������
+ for (Sensor sensor : device.getVersion().getSensors()) {
+ if (!sensorCodes.contains(sensor.getCode()))
+ continue;
+ Object dataO = datas.get(sensor.getCode());
+ if (dataO != null) {
+ String data = String.valueOf(dataO);
+ result.put(sensor.getCode(), data);
+ } else {
+ if (sensor.getCode().equals("a01008") ||sensor.getCode().equals("a01007")){
+ result.put(sensor.getCode(), "-");
+ }else {
+ result.put(sensor.getCode(), "0");
+ }
+
+ }
+ }
+ 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());
+
+ return queryFiveDataByMacVO;
+ }
+
//���������������������������������
private Map<String, Object> orderSixParam(Map<String, Object> data) {
LinkedHashMap result = new LinkedHashMap();
--
Gitblit v1.8.0