Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

Merge remote-tracking branch 'origin/master'

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

@@ -69,7 +69,7 @@


    @Override

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

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

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

        LocalDate localDate = LocalDate.now();

        // 昨日00:00:00

        parameters.put("start", localDate.minusDays(1));

@@ -352,8 +352,9 @@


    @Override

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

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

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

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

        Object sensorKey = parameters.remove("macKey");

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

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

        LocalDate end = LocalDate.now(),start;

        // 每月一日的数据取上月的数据

@@ -366,10 +367,7 @@
        }

        parameters.put("start", start);

        parameters.put("end", end);

        String sensorKey = (String) parameters.remove("macKey");

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

        sensorKeys.add(sensorKey);

        parameters.put("sensorKeys", sensorKeys);

        parameters.put("sensorKeys", Arrays.asList(sensorKey));



        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

        if (isEmpty(average)) {


 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -13,7 +13,22 @@
        FROM

            history_minutely

        WHERE

            mac = #{mac}

            mac IN

                (SELECT

                    d.mac 
                FROM

                    device d,

                    monitor_point mp 
                WHERE

                    d.is_delete = 0 
                    AND d.monitor_point_id = mp.id 
                    <if test="monitorPointId != null">

                    AND mp.id =    #{monitorPointId}

                    </if>

                    <if test="mac != null">

                    AND d.mac = #{mac}

                    </if>

                )	
        AND time >= #{start}

        AND time &lt; #{end}

    </select>