chen_xi
2023-06-29 123181df72f846957a5b05cf45b323f8762fe9b8
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -97,9 +97,12 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
        if (monitorPointIds.length >3){
            return ResultMessage.ok();
        }
        params.put("monitorPointIds", monitorPointIds);
        //List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(new ArrayList<>());
        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(response);
    }
    /**
@@ -127,12 +130,11 @@
     */
    @PostMapping("getHourlyDataExcel")
    public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params) {
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("times") || !params.containsKey("type")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> resList = monitorPointService.getHourlyDataDataV3(params);
        return ResultMessage.ok(resList);
    }
}