From 04dc60723434d7e7b1ea5052e971c900b77d1cfc Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 11:07:12 +0800
Subject: [PATCH] 解决弹窗undefined
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 461bfea..dff8765 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -33,6 +34,8 @@
import com.moral.entity.Sensor;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMapper;
+import com.moral.mapper.MonitorPointMapper;
+import com.moral.mapper.OrganizationRelationMapper;
import com.moral.mapper.SensorMapper;
import com.moral.mapper.SensorUnitMapper;
import com.moral.service.AccountService;
@@ -57,6 +60,12 @@
@Resource
private ProfessionService professionService;
+
+ @Resource
+ private OrganizationRelationMapper organizationRelationMapper;
+
+ @Resource
+ private MonitorPointMapper monitorPointMapper;
@Override
public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {
@@ -287,7 +296,7 @@
if (sensorUnits.containsKey(sensorKey)) {
Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
String rules = sensorUnit.get("rules").toString();
- rules = rules.replace("d", "").replace("{0}", "sensorKeyValue");
+ rules = rules.replace("d", "").replace("{0}", "value");
Expression expression = AviatorEvaluator.compile(rules);
Map<String, Object> env = new HashMap<String, Object>();
env.put("value", Double.valueOf(sensorKeyValue.toString()));
@@ -376,4 +385,57 @@
return returnMap;
}
+
+ @Override
+ public List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters) {
+ //������������id
+ String organizationId = parameters.get("organization_id").toString();
+ //������������������������������������������������������id
+ List<Object> organizationIdList = new ArrayList<>();
+ organizationIdList.add(organizationId);
+ //���������������������������������id
+ List<Object> parentIdList = new ArrayList<>();
+ parentIdList.add(organizationId);
+
+ //������������
+ for(int i=0;i<10;i++) {
+ if(!parentIdList.isEmpty()) {
+ //������������������������������
+ List<Map<String, Object>> childIdList = organizationRelationMapper.getChildIdByParentId(parentIdList);
+ //���������������id������
+ parentIdList.clear();
+ //������������id������������������
+ for (Map<String, Object> map : childIdList) {
+ organizationIdList.add(map.get("child_id"));
+ parentIdList.add(map.get("child_id"));
+ }
+ }else {
+ break;
+ }
+ }
+ System.out.println(organizationIdList);
+
+ //������������id������������id
+ List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);
+ //���List<Map<String, Object>>���������List<Object>
+ List<Object> monitorPointIdList = new ArrayList<>();
+ for (Map<String, Object> map : monitorPointIdListMap) {
+ monitorPointIdList.add(map.get("id"));
+ }
+
+ //������������id���������������������������
+ //������������������������
+ Calendar rightNow = Calendar.getInstance();
+ //���������������������������
+ Calendar beforeTime = Calendar.getInstance();
+ beforeTime.add(Calendar.MINUTE, -5);// 5���������������������
+ Date beforeD = beforeTime.getTime();
+ Date end = rightNow.getTime();
+ String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(end);
+ String before5Time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(beforeD); // ������������������
+
+ String sensor = parameters.get("sensor").toString();
+ List<Map<String, Object>> result = historyMapper.getAVGSensorRankByMonitorPointIdList(sensor, monitorPointIdList, before5Time, endTime);
+ return result;
+ }
}
--
Gitblit v1.8.0