json位置修改

fengxiang

2017-11-03 269fd088f1c308b7e11d531a4485d163261ea2df

 src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java

@@ -10,8 +10,6 @@
import java.util.Map;

import java.util.Set;



import org.apache.commons.collections4.CollectionUtils;

import org.apache.commons.collections4.MapUtils;

import org.apache.commons.lang3.StringUtils;

import org.apache.commons.lang3.time.DateUtils;

import org.springframework.beans.factory.annotation.Autowired;

@@ -52,35 +50,48 @@
      // 1.0 实际标准值

      resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));



      //resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);

		
      //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 (MapUtils.isNotEmpty(average)) {

         resultMap.putAll(average);

      } else {

      if (ObjectUtils.isEmpty(average)) {

         // 空值临时处理

         resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);

         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 (MapUtils.isNotEmpty(average)) {

         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;

@@ -91,7 +102,7 @@
               } else {

                  index = i - 1;

               }

               continue;

               break;

            }

         }

         if (index == -1) {

@@ -105,10 +116,16 @@
            IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));

         }

      }

      if (!resultMap.containsKey("AQI")) {

         resultMap.put("AQI", Collections.max(IAQIs));

		
      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;

   }



@@ -118,12 +135,14 @@
      setOrgIdsByAccount(parameters);



      Date date = new Date();

      // 当前时间 -10分钟

      parameters.put("start", DateUtils.addMinutes(date, -10));

      // 当前时间 -5分钟

      parameters.put("end", DateUtils.addMinutes(date, -5));

      List<Map<String, Object>> averageByAll = historyMapper.getAverageByAll(parameters);



      // 临时方案，空值处理

      if (CollectionUtils.isEmpty(averageByAll)) {

      if (ObjectUtils.isEmpty(averageByAll)) {

         String macLog = historyMapper.getMacLogByLast();

         if (StringUtils.isNotBlank(macLog)) {

            Map<String, Object> map = JSON.parseObject(macLog);

@@ -178,10 +197,11 @@
      if (ObjectUtils.isEmpty(account)) {

         throw new BusinessException(accountId + "该账号不存在！");

      }

      String organization = account.getOrganization();

      String orgId = account.getOrganization();

      // 不是摩瑞尔账号的需要根据组织来获取数据权限

      if (!("-1".equals(organization) || ResourceUtil.getValue("orgId").equals(organization))) {

         Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());

		
      if (!("-1".equals(orgId) || ResourceUtil.getValue("orgId").equals(orgId))) {

         Set<String> orgIds = organizationService.getChildOrganizationIds(orgId);

         parameters.put("orgIds", orgIds);

      }

   }