cjl
2023-07-07 1e6dbe352c35a54c299008c523e38b1e59d1ea03
Merge remote-tracking branch 'origin/cjl' into qa
1 files modified
9 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java 9 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -153,14 +153,17 @@
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public void exlOut(HttpServletResponse response) {
    public void exlOut(HttpServletResponse response,@RequestBody Map<String, Object> params) {
        //导出字段集合
        // List<ExcelHeader> excelHeaders = Arrays.asList(new ExcelHeader("phone", "手机号"), new ExcelHeader("sexStr", "性别"));
        Map<String, Object> params = new HashMap<>();
       /* Map<String, Object> params = new HashMap<>();
        params.put("macs", Arrays.asList("p5dnd7a0245446", "p5dnd7a0745450"));
        params.put("sensors", "a34004,a34002");
        params.put("type", "hours");
        params.put("times", Arrays.asList("2023-07-01 00", "2023-07-02 00"));
        params.put("times", Arrays.asList("2023-07-01 00", "2023-07-02 00"));*/
        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("times") || !params.containsKey("type")) {
            return;
        }
        //数据集合
        List<Map<String, Object>> resList = monitorPointService.getHourlyDataDataV3Excel(params);
        if (CollectionUtils.isEmpty(resList)) {