kaiyu
2020-12-01 dbc664b7b328809818bd070e152248249ff2f939
src/main/java/com/moral/controller/WebController.java
@@ -205,6 +205,7 @@
     * @Date: 2020/10/19
     */
    @UserLoginToken
    @GetMapping("fiveMinuteAvgDataNew")
    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) {
        //获取参数,传感器和regionCode
@@ -501,14 +502,13 @@
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
        if (ObjectUtils.isEmpty(monitorPoints))
            return new ResultBean<>("无对应站点设备信息", ResultBean.FAIL);
        return new ResultBean<>(monitorPoints);
        return new ResultBean<List<MonitorPoint>>(monitorPoints);
    }
    /**
     * @Description: 返回结果添加设备经纬度以及state
     * @Param: [datas, devices]
     * @return: java.util.List<java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */