调整 计算平均值算法

xufenglei

2018-03-30 71d49c588d62385a57a2ea5434f3c407a1d5c1ca

调整 计算平均值算法

 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -1,25 +1,17 @@
package com.moral.service.impl;



import java.math.BigDecimal;

import java.math.RoundingMode;

import java.time.LocalDateTime;

import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.Callable;

import java.util.concurrent.CompletionService;

import java.util.concurrent.ExecutorCompletionService;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.moral.common.util.ValidateUtil;

import com.moral.entity.Sensor;

import com.moral.mapper.DeviceMapper;

import com.moral.mapper.HistoryMapper;

import com.moral.mapper.SensorMapper;

@@ -45,94 +37,30 @@
    public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {

        ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");

        ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");

        Map<String, Number[]> result = new HashMap<String, Number[]>();

        Map<String,Object> resultMap = new HashMap<String, Object>();

        Map<String,Object> resultMap = new LinkedHashMap<String, Object>();

        accountService.setOrgIdsByAccount(parameters);

        LocalDateTime time = LocalDateTime.now();

        // 当前时间 -10分钟

        parameters.put("start", time.minusMinutes(10));

        // 当前时间 -5分钟

        parameters.put("end", time.minusMinutes(5));

        parameters.put("macKey", "all");

        List<Integer> deviceVersionIds = deviceMapper.getDeviceVersionIdByAreaCode(parameters);

        ExecutorService threadPool = Executors.newCachedThreadPool();

        CompletionService<Map<String, Object>> cs = new ExecutorCompletionService<Map<String, Object>>(threadPool);

        for (Integer deviceVersionId : deviceVersionIds) {

            Map<String, Object> parameter = new HashMap<String, Object>(parameters);

            String queryColumns = "";

            List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);

            for (int i = 0; i < sensors.size(); i++) {

                String sensorKey = (String) sensors.get(i).get("sensor_key");

                queryColumns += "AVG(value -> '$." + sensorKey + "') " + sensorKey;

                if (i != sensors.size() - 1) {

                    queryColumns += " ,";

                } 
            }

            parameter.put("queryColumns", queryColumns);

            parameter.put("deviceVersionId", deviceVersionId);

            cs.submit(new Callable<Map<String, Object>>() {

                @Override

                public Map<String, Object> call() throws Exception {

                    Map<String, Object> map = new HashMap<String, Object>();

                    List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameter);

                    map.put(deviceVersionId.toString(), list.get(0));

                    return map;

                }

            });

        List<Sensor> Sensors = sensorMapper.getSensorsByCriteria(parameters);

        List<String> sensorKeys = new ArrayList<String>();

        for (Sensor sensor : Sensors) {

            sensorKeys.add(sensor.getSensorKey());

        }

        List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();

        for (Integer deviceVersionId : deviceVersionIds) {

            list.add(cs.take().get());

        }

		
        for (Map<String, Object> map : list) {

            Collection<Object> values = map.values();

            for (Object object : values) {

                Map<String, Object> result1 = (Map<String, Object>)object;

                for (String key : result1.keySet()) {

                    Number[] numbers = new Number[2];

                    Double sum = (Double) result1.get(key);

                    Integer count = 1;

                    if (result.containsKey(key)) {

                        numbers = result.get(key);

                        sum += (Double)numbers[0];

                        count += (Integer)numbers[1];

                    }

                    numbers[0] = sum;

                    numbers[1] = count;

                    result.put(key, numbers);

                    resultMap.put(key, new BigDecimal(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue());

                }

            }

        }



        return resultMap;

        /*Date date = new Date();

        // 当前时间 -10分钟

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

        // 当前时间 -5分钟

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

        String queryColumns = "";

        for (int i = 1; i < 20; i++) {

            if (i == 1) {

                queryColumns += "AVG(value -> '$.e" + i + "') e" + i;

            } else {

                queryColumns += " , AVG(value -> '$.e" + i + "') e" + i;

            }

        }

        parameters.put("queryColumns", queryColumns);

        parameters.put("macKey", "all");

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);



        return list.get(0);*/



        resultMap.putAll(list.get(0));

        return resultMap;

    }



    @Override

    public Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");

        ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");

        ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");

        Object macKey = parameters.get("macKey");

        ValidateUtil.notNull(macKey, "param.is.null");



        Map<String, Object> result = new LinkedHashMap<String, Object>();

        accountService.setOrgIdsByAccount(parameters);

@@ -140,11 +68,13 @@
        // 当前时间 -1小时

        parameters.put("start", time.minusHours(1));

        parameters.put("end", time);

        parameters.put("macKey", "'$." + parameters.get("macKey") + "'");

        List<String> sensorKeys = new ArrayList<String>();

        sensorKeys.add(macKey.toString());

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);



        for (Map<String, Object> map : list) {

            result.put((String) map.get("name"), map.get("avg"));

            result.put((String) map.get("name"), map.get(macKey.toString()));

        }

        return result;

    }


 src/main/resources/mapper/HistoryMapper.xml

@@ -3,13 +3,12 @@
<mapper namespace="com.moral.mapper.HistoryMapper">
    <select id="getAreaAllDataByAccount" resultType="java.util.LinkedHashMap">

        SELECT

        <if test="macKey == 'all'">

            ${queryColumns}

        </if>	
        <if test="macKey != 'all'">

            d.`name`,

            AVG( h.`value` -> ${macKey}) avg

        </if>	
            <if test="macKey != null">

                d.`name`,

            </if>	
            <foreach  collection="sensorKeys" separator="," item="sensorKey">

                AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'

            </foreach>

        FROM

            history h,

            device d,

@@ -26,15 +25,9 @@
                #{listItem}

            </foreach>

        </if>

        <if test="deviceVersionId != null">

            AND d.device_version_id = #{deviceVersionId} 
        </if>

        <if test="macKey != 'all'">

        <if test="macKey != null">

            GROUP BY d.id

            ORDER BY avg desc

            ORDER BY ${macKey} desc

        </if>    

    </select>

	


	
</mapper>