传感器均值接口更新

于紫祥_1901

2020-09-21 4dad2c9b7bd8b6a37b7ced141be1245eabc899c1

传感器均值接口更新

 src/main/java/com/moral/config/WebSocketConfig.java

@@ -14,6 +14,7 @@
@Configuration
public class WebSocketConfig {

    //本地测试需要将注释解开
/*    @Bean
    public ServerEndpointExporter serverEndpointExporter() {
        return new ServerEndpointExporter();

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

@@ -675,17 +675,27 @@
        return new ResultBean<List<MonitorPoint>>(monitorPoints);
    }


    /*
    * 参数：monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
    * 获取传感器均值接口
    * */
    @GetMapping("report_avg_datas")
    public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
            throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        ParameterUtils.getTimeType4Time(parameters);
        String time1= (String) parameters.get("time");
        String mac1= (String) parameters.get("mac");
        List<Map<String, Object>> list=null;
        if (mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
                list=null;
        }else {
        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
        Object sensorKey = parameters.remove("sensorKey");
        parameters.put("sensors", Arrays.asList(sensorKey));
        // monitorPointService.isCompensateCalculation(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

            list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
        for (Map<String, Object> map : list) {
            String time = map.get("time").toString();
            time = time.substring(time.length() - 2);
@@ -695,6 +705,7 @@
            }
            map.put("value", map.remove(sensorKey));
        }
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }