临时 处理 取值

xufenglei

2017-10-31 7251cc34271ed8bb6500a05313539dbc4b005d40

临时 处理 取值

 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,34 +50,44 @@
        // 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", 0);

        } else {

            resultMap.putAll(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");

            }

            String[] macKeyValues = ResourceUtil.getArrValue(macKey);

@@ -107,13 +115,12 @@
        }

        

        double AQI = Collections.max(IAQIs);

        if (AQI == 0.0) {

            AQI = 231.670;

        }

        // 空值临时处理

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

            resultMap.put("AQI", AQI);

            resultMap.put("AQI", String.format("%.2f", AQI));

        }



		 
         */

        return resultMap;

    }



@@ -123,12 +130,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);

@@ -183,10 +192,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);

        }

    }