fix:部分功能优化

cjl

2023-08-22 58fdbd07beae496c4c3b0744efe86a7d82e382b7

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

@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -55,12 +56,13 @@
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        //处理查询业务
        List<DeviceAndFiveMinuteDataDTO> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);

        List<Map<String, Object>> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);
        Map<String,List<Map<String, Object>>> dtoResult = new HashMap<>();
        dtoResult.put("devices",dto);
        //转换前端参数
        DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);
        //DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);

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

    /**