Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-06 3c3250c96a13c796aa88f1366b6d278cb95739e5

Merge remote-tracking branch 'origin/master'

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

@@ -636,6 +636,11 @@
            String time = map.get("time").toString();

            time = time.substring(time.length() - 2);

            map.put("time", Integer.valueOf(time));

            List<Number> values = new ArrayList<Number>();

            for (String string : sensorKeys) {

                values.add((Number) map.remove(string));

            }

            map.put("values", values);

        }

        return new ResultBean<List<Map<String, Object>>>(list);

    }