分页查询修改

master
徐杰盟 2024-01-26 09:27:45 +08:00
parent 4bf90bd135
commit 4dfd5a0cd8
2 changed files with 2 additions and 8 deletions

View File

@ -62,7 +62,7 @@ public class WaterQualityController {
@Operation(summary = "水质监测数据分页查询")
@PostMapping("/page")
public R<Page<StWaterQualityR>> page(
@Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody
@Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true)
WaterQualityPageSo waterQualityPageSo
) {
return R.ok(waterqualityService.page(waterQualityPageSo));

View File

@ -1,7 +1,5 @@
package com.gunshi.project.xyt.so;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gunshi.core.dateformat.DateFormatString;
import com.gunshi.db.dto.DateTimeRangeSo;
import com.gunshi.db.dto.PageSo;
import com.gunshi.project.xyt.validate.markers.QueryPage;
@ -9,10 +7,6 @@ import com.gunshi.project.xyt.validate.markers.QueryTimeRange;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* Description:
@ -29,6 +23,6 @@ public class WaterQualityPageSo {
private PageSo pageSo;
@Schema(description = "时间范围")
@NotNull(message = "时间范围不能为空")
@NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class})
private DateTimeRangeSo timeSo;
}