2021与蓝度共同重构项目,服务端
liuhaonan
2022-08-12 a49a6a80a76b2642232b887dd646a255cf5eaa4e
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -77,11 +77,14 @@
     */
    @GetMapping("/report/list")
    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
            , @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
            , @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "deviceCode", required = false) String deviceCode
            , @RequestParam(value = "order", required = false) Integer order
            ,@RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode,order,seq);
        List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
        if (lightReportDataBos == null) {