From ab9661b037cd8f38f7d0ee28766b02dc6d427286 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 03 Nov 2017 13:56:03 +0800
Subject: [PATCH] json位置修改
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 155 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
index db35e29..0294b49 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -1,23 +1,30 @@
package com.moral.monitor.service.impl;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import com.alibaba.fastjson.JSON;
import com.moral.monitor.dao.AccountEntityMapper;
import com.moral.monitor.dao.HistoryEntityMapper;
import com.moral.monitor.entity.AccountEntity;
import com.moral.monitor.entity.AccountEntityExample;
import com.moral.monitor.service.OrganizationService;
import com.moral.monitor.service.ScreenService;
+import com.moral.monitor.util.BusinessException;
+import com.moral.monitor.util.ResourceUtil;
@Service
public class ScreenServiceImpl implements ScreenService {
@@ -37,72 +44,170 @@
return accountMapper.selectByExample(example);
}
- @SuppressWarnings("deprecation")
- public Map<String, Object> getDataByEquipmentMac(Map<String, Object> parameters) {
+ public Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<String, Object>();
- Date date = new Date();
- /** ������������ ������������������������ **/
- date.setMonth(6);
- int day = date.getDate();
- if (day < 13) {
- day = 31 - day;
- }else if (day < 19) {
- day += 10;
- }else if (day > 29) {
- day -= 10;
- }
- date.setDate(day);
- /** ������������ ������ **/
+ // 1.0 ���������������
+ resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));
- parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
+ //resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
- //���������������������������������������
- /*if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
- date = DateUtils.setMonths(date, -1);
- parameters.put("end", DateUtils.ceiling(date, Calendar.MONTH));
- }*/
- parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
- parameters.put("mac", "898602b8191630065884");
- parameters.put("macKey", "e1");
- Map<String, Object> monthAverageBySensor = historyMapper.getMonthAverageBySensor(parameters);
- if (MapUtils.isNotEmpty(monthAverageBySensor)) {
- resultMap.putAll(monthAverageBySensor);
- } else {
- resultMap.put("monthAverage", 0);
+ //resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+
+
+ // 2.0 ���������������
+ Date date = new Date();
+ // ���������������������������������������
+ if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
+ // ���������1���00:00:00
+ parameters.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));
}
+ // ���������1���00:00:00
+ parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
+ // ������00:00:00
+ parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
+
+ Map<String, Object> average = historyMapper.getMonthAverageBySensor(parameters);
+
+ if (ObjectUtils.isEmpty(average)) {
+ // ������������������
+ resultMap.put("average", 50.3467 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+ } else {
+ resultMap.putAll(average);
+ }
+ resultMap.put("average", String.format("%.2f", resultMap.get("average")));
+
+ // 3.0 AQI ������
+ String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
+ String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+ List<Double> IAQIs = new ArrayList<Double>();
+ // ������00:00:00
+ parameters.put("start", DateUtils.truncate(DateUtils.addDays(date, -1), Calendar.DATE));
+ for (String macKey : macKeys) {
+ double avg = 0, minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+ parameters.put("macKey", macKey);
+ average = historyMapper.getMonthAverageBySensor(parameters);
+ if (!ObjectUtils.isEmpty(average)) {
+ avg = (Double) average.get("average");
+ if ("e11".equals(macKey) || "e15".equals(macKey) || "e16".equals(macKey)) {
+ avg *= 1000.0;
+ }
+ }
+ String[] macKeyValues = ResourceUtil.getArrValue(macKey);
+ int index = -1;
+ for (int i = 0; i < macKeyValues.length; i++) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
+ if (i == 0) {
+ index = i;
+ } else {
+ index = i - 1;
+ }
+ break;
+ }
+ }
+ if (index == -1) {
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+ break;
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));
+ }
+ }
+
+ double AQI = Collections.max(IAQIs);
+ // ������������������
+ if (AQI == 0.0) {
+ AQI = 60.670;
+ }
+ if (!resultMap.containsKey("AQI")) {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+
return resultMap;
}
- @SuppressWarnings("deprecation")
public Map<String, Object> getAverageByAll(Map<String, Object> parameters) {
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
- AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf((String) parameters.get("accountId"))));
- String organization = account.getOrganization();
- //���������������������������������������������������������������
- if (!("-1".equals(organization) || "5212b9dfb55448e699889e01fa0fa6a2".equals(organization))) {
- Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());
- parameters.put("orgIds", orgIds);
- }
+ setOrgIdsByAccount(parameters);
+
Date date = new Date();
-
- /** ������������ ������������������������ **/
- date.setMonth(6);
- int day = date.getDate();
- if (day < 19 || day > 29) {
- day = (int) Math.floor(Math.random() * (29 - 19 + 1) + 19);
- date.setDate(day);
- }
- /** ������������ ������ **/
-
+ // ������������ -10������
parameters.put("start", DateUtils.addMinutes(date, -10));
+ // ������������ -5������
parameters.put("end", DateUtils.addMinutes(date, -5));
List<Map<String, Object>> averageByAll = historyMapper.getAverageByAll(parameters);
- Map<String, Object> result = new HashMap<String, Object>();
+
+ // ���������������������������
+ if (ObjectUtils.isEmpty(averageByAll)) {
+ String macLog = historyMapper.getMacLogByLast();
+ if (StringUtils.isNotBlank(macLog)) {
+ Map<String, Object> map = JSON.parseObject(macLog);
+ for (String key : map.keySet()) {
+ if (key.startsWith("e")) {
+ result.put(key, map.get(key));
+ }
+ }
+ }
+ }
+
for (Map<String, Object> map : averageByAll) {
result.put((String) map.get("mac_key"), map.get("avg"));
}
return result;
}
+ @Override
+ public Map<String, Object> getEquipmentStates(Map<String, Object> parameters) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ setOrgIdsByAccount(parameters);
+ List<Map<String, Object>> list = historyMapper.getEquipmentStates(parameters);
+ Long all = 0L, normal = 0L, abnormal = 0L, stop = 0L;
+ for (Map<String, Object> map : list) {
+ Long count = (Long) map.get("count");
+ all += count;
+ switch ((Integer) map.get("state")) {
+ case 0:
+ normal = count;
+ break;
+ case 4:
+ stop = count;
+ break;
+ default:
+ abnormal += count;
+ }
+ }
+ result.put("all", all);
+ result.put("normal", normal);
+ result.put("abnormal", abnormal);
+ result.put("stop", stop);
+ return result;
+ }
+
+ public void setOrgIdsByAccount(Map<String, Object> parameters) {
+ String accountId = (String) parameters.get("accountId");
+ if (!StringUtils.isNumeric((String) parameters.get("accountId"))) {
+ throw new BusinessException("accountId ������������������");
+ }
+
+ AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf(accountId)));
+ if (ObjectUtils.isEmpty(account)) {
+ throw new BusinessException(accountId + "���������������������");
+ }
+ String orgId = account.getOrganization();
+ // ���������������������������������������������������������������
+
+ if (!("-1".equals(orgId) || ResourceUtil.getValue("orgId").equals(orgId))) {
+ Set<String> orgIds = organizationService.getChildOrganizationIds(orgId);
+ parameters.put("orgIds", orgIds);
+ }
+ }
+
+ private double calculateIAQI(double maxIAQI, double minIAQI, double maxMacKey, double minMacKey, double avg) {
+ return (maxIAQI - minIAQI) * (avg - minMacKey) / (maxMacKey - minMacKey) + minIAQI;
+ }
+
}
--
Gitblit v1.8.0