fix:实测补偿修复

cjl

2023-08-18 7d76b9e89baa29a1ae2e5e406d6d11dcca15325a

 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java

@@ -62,7 +62,22 @@
        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);

        //转换前端参数
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints);
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false);

        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }

    @GetMapping("queryMonitorPointsState")
    public ResultMessage queryMonitorPointsState(MonitorPointQueryForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //处理查询业务
        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);

        //转换前端参数
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,true);

        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
@@ -153,14 +168,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)) {