whycxzp
2022-09-30 648a36ac74755c8df9d50a2669ea024490cf6fd3
src/main/java/com/whyc/controller/FileParamController.java
@@ -25,12 +25,14 @@
    public Response getMonVolStd(){
        return service.getMonVolStd();
    }
    @ApiOperation("按照筛选条件查询数据库信息")
    @GetMapping("getDataByCondition")
    public Response getDataByCondition(@RequestParam(required = false ,defaultValue = "1982-01-01 00:00:00") String startTime
                                       , @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
                                       , @RequestParam(required = false) int battVol)  {
                                       , @RequestParam(required = false) int battVol
                                       ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
                                        ,@RequestParam(required = false ,defaultValue = "10") int pageSize)  {
        Date testTime1= null;
        Date testTime2= null;
        try {
@@ -39,7 +41,7 @@
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return service.getDataByCondition(testTime1,testTime2,battVol);
        return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize);
    }
    @ApiOperation("分级评价-系数及阈值查询")