气体浓度加入方位

huangzhen

2023-12-28 d6ae4bd543971312b51ba0e40b2565f63ed682e0

 src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java

@@ -67,7 +67,7 @@
            startTime = zeroTime;
            endTime = nowTime;
        }
        List<GasConcentration> gasConcentrationList =  gasConcentrationService.listDatabyTimeSlot(startTime,endTime);
        List<GasConcentration> gasConcentrationList =  gasConcentrationService.listDatabyTimeSlotAndPosition(startTime,endTime,reqDto.getPosition());
        if (CollectionUtils.isEmpty(gasConcentrationList))
            return success;
        GasCategory gasCategory = gasCategoryService.findById(reqDto.getGasName());
@@ -124,7 +124,7 @@
        searchResult.setPageIndex(pageQuery.getPageIndex());
        searchResult.setPageSize(pageQuery.getPageSize());
        searchResult.setSuccess();
        Page<GasConcentration> pageResult =  gasConcentrationService.listDatabyTimeSlotAndPage(pageQuery);
        Page<GasConcentration> pageResult =  gasConcentrationService.listDatabyTimeSlotAndPositionAndPage(pageQuery);
        if (CollectionUtils.isEmpty(pageResult.getContent()))
            return searchResult;
        searchResult.setTotal(pageResult.getTotalElements());