Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-07-31 33ca0da19b3f87751662de0072c48ce9ce963202

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

@@ -362,6 +362,13 @@
        Map<String, Object> parameters = getParametersStartingWith(request, null);

        return historyMinutelyService.getDayAQIByDevice(parameters);

    }

    
    @GetMapping("hour-aqi")

    @ApiOperation(value = "获取一小时AQI", notes = "获取一小时AQI")

    public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {

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

        return historyMinutelyService.getHourAQIByDevice(parameters);

    }



    /**

     * Gets the average by all. 获取某账号某区域10分钟前到5分钟前所有传感器平均数值排名


 src/main/java/com/moral/service/HistoryMinutelyService.java

@@ -10,6 +10,8 @@
public interface HistoryMinutelyService {



    Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);

    
    Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);



    Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;




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

@@ -80,6 +80,28 @@
        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

        return getAQIByDataMap(average);

    }

    
    @Override

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

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

        LocalDate localDate = LocalDate.now();

        System.out.println("localDate:"+localDate);

        // 昨日00:00:00

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

    	
        Calendar calendar = Calendar.getInstance();

        calendar.setTime(new Date());

        calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR) - 1);

        System.out.println("++++++"+calendar);

        int hour = calendar.get(Calendar.HOUR)-1;

        System.out.println("当前小时减一"+hour);

    	
        // 今日00:00:00

        parameters.put("end", localDate);

        parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));

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

        return getAQIByDataMap(average);

    }



    private Map<String, Object> getAQIByDataMap(Map<String, Double> average) {

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