Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

Merge remote-tracking branch 'origin/master'

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

@@ -4,7 +4,6 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.io.OutputStream;

import java.util.HashMap;

import java.util.List;

import java.util.Map;




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

@@ -456,7 +456,9 @@
        Map<String, Object> parameters = getParametersStartingWith(request, null);

        parameters.put("type", "month");

        String sensorKey = "list";

        if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

        if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

            parameters.put("description", "description");

        } else {

            sensorKey = parameters.remove("sensorKey").toString();

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

            sensorKeys.add(sensorKey);


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

@@ -67,7 +67,11 @@
                    String[] split = sensor.split("-");

                    if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {

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

                        map.put("name", split[1]);

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

                            map.put("name", split[3]);

                        } else {

                            map.put("name", split[1]);

                        }

                        map.put("value", alarmData.get(key));

                        list.add(map);

                    }


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

@@ -223,7 +223,17 @@
        Collections.sort(sortList,new Comparator<Map.Entry<String,Double>>(){

            @Override

            public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {

                return o1.getValue().compareTo(o2.getValue());

                if (o2.getValue().compareTo(o1.getValue()) == 0) {

                    String[] key1 = o1.getKey().split("-");

                    String[] key2 = o2.getKey().split("-");

                    String sensor1  = key1[0].replace("e", "");

                    String sensor2  = key2[0].replace("e", "");

                    if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {

                        return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));

                    }

                    return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));

                }

                return o2.getValue().compareTo(o1.getValue());

            }

            

        });

@@ -325,7 +335,11 @@
            List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);

            for (Sensor sensor : sensorList) {

                sensorKeys.add(sensor.getSensorKey());

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

                String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();

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

                    string += "-" + sensor.getDescription();

                }

                sensors.add(string);

            }

        }

        parameters.put("sensorKeys", sensorKeys);


 src/main/resources/mapper/AlarmMapper.xml

@@ -61,8 +61,8 @@
                    <if test="mac != null">

                    AND d.mac =    #{mac}

                    </if>

                    <if test="state != null">

                    AND h.state = #{state}

                    <if test="level != null">

                    AND h.state = #{level}

                    </if>

                GROUP BY

                    <if test="dimension=='monitorPoint'">