fix:测试提交

jinpengyong

2024-06-18 7a1c0a8f26b54db6fdf0dcb9a2568aa9811f8f4c

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

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

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

        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
@@ -73,7 +73,22 @@
        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);

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

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

    @GetMapping("queryMonitorPointsAvg")
    public ResultMessage queryMonitorPointsAvg(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,false,true);

        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
@@ -115,7 +130,7 @@
        }*/
        params.put("monitorPointList", monitorPoint);
        String[] monitorPointIds = monitorPoint.split(",");
        if (monitorPointIds.length > 3) {
        if (monitorPointIds.length > 7) {
            return ResultMessage.ok();
        }