报表优化

xufenglei

2018-04-08 6f08c72b1056c9e4b2bdf79bafbc49fcc3cdcaa1

报表优化

 src/main/java/com/moral/controller/ReportController.java

@@ -50,7 +50,7 @@
    public ResultBean<Boolean> getExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {

        Map<String, Object> parameters = getParametersStartingWith(request, null);

        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

        List<String> sensors= new ArrayList<String>((Set<String>) parameters.get("sensors"));

        List<String> sensors= (List<String>) parameters.get("sensors");

        String[][] exportColumn = new String[sensors.size() + 1][];

        exportColumn[0] = new String[] { "时间", "20", "time" };

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


 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -24,5 +24,7 @@
    Device selectWithOrgIdsByMac(String mac);

    

    List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);

	


    Integer getDeviceCountByRegion(Map<String, Object> parameters);



}

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

@@ -53,7 +53,7 @@
import com.moral.service.HistoryMinutelyService;



@Service

@SuppressWarnings({ "unchecked", "rawtypes", "unused" })

@SuppressWarnings({ "unchecked", "unused" })

public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {



    @Resource

@@ -155,12 +155,12 @@
        

        List<Object> timeList = new ArrayList<Object>();

        for (int i = 0; i < timeLength; i++) {

            timeList.add(i, String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));

            timeList.add(String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));

        }

        parameters.put("timeList", timeList);

        

        ExecutorService threadPool = Executors.newCachedThreadPool();

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

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

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

            Map<String, Object> map = list.get(i);

            map.put("part", i);

@@ -169,9 +169,9 @@
            }

            map.put("time", map.remove("formatTime"));

            map.putAll(parameters);

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

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

                @Override

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

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

                    return getMonitorPointOrDeviceAvgData4Compare(map);

                }

            });

@@ -181,7 +181,8 @@
        for (Map<String, Object> map : list) {

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

        }

        Map[] maps = new HashMap[list.size()];

        Object[] datas = new Object[list.size()];

        Object[] deviceCounts = new Object[list.size()];

        Set<String> sensors = new TreeSet<String>(new Comparator<String>() {

            @Override

            public int compare(String o1, String o2) {

@@ -193,7 +194,11 @@
            for (String key : map.keySet()) {

                if (key.startsWith("data")) {

                    int index = Integer.valueOf(key.replace("data", ""));

                    maps[index] = map;

                    datas[index] = map.get(key);

                }

                if (key.startsWith("deviceCount")) {

                    int index = Integer.valueOf(key.replace("deviceCount", ""));

                    deviceCounts[index] = map.get(key);

                }

                if (key.startsWith("sensors")) {

                    sensors.addAll((List<String>) map.get(key));

@@ -201,27 +206,19 @@
            }

        }

        resultMap.put("times", timeList);

        resultMap.put("datas", Arrays.asList(maps));

        resultMap.put("datas", Arrays.asList(datas));

        resultMap.put("deviceCounts", Arrays.asList(deviceCounts));

        resultMap.put("sensors", new ArrayList<Object>(sensors));

        return resultMap;

    }



    

    public Map<String, List<Object>> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {

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



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

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

        List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);

		
        List<Object> timeList = (List<Object>) parameters.get("timeList");



        List<Object> dataList = new ArrayList<Object>();

        Set<String> sensors = new TreeSet<String>(new Comparator<String>() {

            @Override

            public int compare(String o1, String o2) {

                return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));

            }

        });

        sensors.addAll((Set<String>)parameters.get("sensors"));

        List<String> sensors = (List<String>) parameters.get("sensors");

        String part = parameters.get("part").toString();

        Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();

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

            String time = map.get("time").toString();

@@ -239,14 +236,20 @@
                    }

                    doubles[index] = (Double) map.get(sensorKey);

                    doubleMap.put(sensor, doubles);

					
                }

            }

        }

        dataList.add(doubleMap);

        String part = parameters.get("part").toString();

        resultMap.put("data" + part, dataList);

        resultMap.put("sensors" + part, new ArrayList<Object>(sensors));



        Object deviceCount;

        if (parameters.containsKey("deviceCount")) {

            deviceCount = parameters.remove("deviceCount");

        } else {

            deviceCount = deviceMapper.getDeviceCountByRegion(parameters);

        }



        resultMap.put("deviceCount" + part, deviceCount);

        resultMap.put("data" + part, doubleMap);

        resultMap.put("sensors" + part, sensors);

        return resultMap;

    }

    

@@ -272,28 +275,25 @@
        parameters.put("end", end);



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

        Set<String> sensorsSet = new HashSet<String>();

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

        if (parameters.containsKey("sensors")) {

            List<String> sensors;

            try {

                sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});

                for (String sensor : sensors) {

                    sensorKeys.add(sensor.split("-")[0]);

                }

            } catch (Exception e) {

                sensors = (List<String>)parameters.remove("sensors");

                sensorKeys.addAll(sensors);

                sensorKeys = sensors = (List<String>)parameters.remove("sensors");

            }

            sensorsSet.addAll(sensors);

        } else {

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

            for (Sensor sensor : sensors) {

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

            for (Sensor sensor : sensorList) {

                sensorKeys.add(sensor.getSensorKey());

                sensorsSet.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());

                sensors.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());

            }

        }

        parameters.put("sensorKeys", sensorKeys);

        parameters.put("sensors", sensorsSet);

        parameters.put("sensors", sensors);



        return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);

    }


 src/main/resources/mapper/DeviceMapper.xml

@@ -202,4 +202,30 @@
        from device
        where mac = #{mac,jdbcType=VARCHAR}
    </select>

    <select id="getDeviceCountByRegion" resultType="INTEGER">
        SELECT
            COUNT( * ) 
        FROM
            device d 
        WHERE
            d.is_delete = 0 
            AND d.monitor_point_id IN (
                SELECT
                    mp.id 
                FROM
                    monitor_point mp 
                WHERE
                    mp.is_delete = 0 
                    <if test="provinceCode != null">
                    AND mp.province_code = #{provinceCode}
                    </if>
                    <if test="cityCode != null">
                    AND mp.city_code = #{cityCode}
                    </if>
                    <if test="areaCode != null">
                    AND mp.area_code = #{areaCode}
                    </if>
            )
    </select>
</mapper>