1. 修改日统计值的排序查询逻辑

feiyu02

2023-11-23 e2392116cd6f875cdc2f46bc04b04d5305f21b56

 src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java

@@ -19,7 +19,6 @@
    private FugitiveDustService fugitiveDustService;



    //扬尘 监测点历史数据  后端分页
    @GetMapping("/history1")
    public Result conditonQueryAbnormalData3(@RequestParam(defaultValue = "1") Integer page,
@@ -35,12 +34,14 @@
       List<DustSiteData> list= fugitiveDustService.conditonQueryhistoryallData(siteName,mnCode, beginTime,endTime,scenarioType);
        return Result.success(list);
    }

//    返回监测点数据中的不同的场景
    @GetMapping("/scenario")
    public Result conditonQueryHistoryData(){
        List<DustSiteData> list = fugitiveDustService.scenarioData();
        return Result.success(list);
    }

// 返回所有站点名字
    @GetMapping("/sitename")
    public Result allSiteName(){
@@ -57,17 +58,26 @@

//    根据站点名字和时段进行统计分析 后端分页
    @GetMapping("/analysistime")
    public Result analysisByTime( @RequestParam(defaultValue = "1") Integer page,
                                  @RequestParam(defaultValue = "20")Integer pageSize,String siteName,String beginTime, String endTime){
    PageBean pageBean = fugitiveDustService.pageAnalysisTime(page,pageSize,siteName,beginTime,endTime);
    public Result analysisByTime(
            @RequestParam(defaultValue = "1") Integer page,
            @RequestParam(defaultValue = "20") Integer pageSize,
            String siteName,
            String beginTime,
            String endTime,
            String orderProp,
            Boolean asc) {
        PageBean pageBean = fugitiveDustService.pageAnalysisTime(page, pageSize, siteName, beginTime, endTime,
                orderProp, asc);
    return Result.success(pageBean);
}

    //动态计算分析数据  不分页
    @GetMapping("/analysisall")
    public Result analysisAll(String siteName,String beginTime, String endTime){
        List<AnalysisDustData> list = fugitiveDustService.analysisAll(siteName,beginTime,endTime);
        return Result.success(list);
    }

//获得不同的异常类型
    @GetMapping("/exceptiontype")
    public Result getExceptionType(){
@@ -83,7 +93,6 @@
    PageBean pageBean =  fugitiveDustService.getExceptionData(page,pageSize,siteName,exceptionType,beginTime,endTime);
    return Result.success(pageBean);
}



    //条件查询异常数据 不分页
@@ -107,7 +116,6 @@
        List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
        return Result.success(list);
    }



    //   根据时间,地址，运维商，点位名称，返回该异常类型的个数
@@ -139,6 +147,7 @@
        fugitiveDustService.addAuditNotes(auditInfo);
        return Result.success();
    }

    /*返回审核表所有数据*/
    @PostMapping("/auditAllData")
    public Result getAuditAllData(){