yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BzServiceResourceSo.dateTimeRangeSo取消必填约束

master
李一帆 2024-01-26 15:14:22 +08:00
parent 61fba4b4ba
commit fc501b83c5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
View File

@ -83,8 +83,10 @@ public class BzServiceResourceController {
query.like(BzServiceResource::getName, so.getName()); query.like(BzServiceResource::getName, so.getName());
} }
if (so.getDateTimeRangeSo() != null) {
query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd()); query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd());
query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart()); query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart());
}
query.orderByDesc(BzServiceResource::getRegisterDate); query.orderByDesc(BzServiceResource::getRegisterDate);
Page<BzServiceResource> page = serviceResourceDao.page(so.getPageSo().toPage(), query); Page<BzServiceResource> page = serviceResourceDao.page(so.getPageSo().toPage(), query);

2
src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java
View File

@ -21,7 +21,7 @@ import java.util.Date;
@Data @Data
@ToString @ToString
@Schema(description = "服务资源监控记录") @Schema(description = "服务资源监控记录")
@TableName("BZ_SERVICE_RESOURCE_R") @TableName("BZ_SERVICE_RESOURCE_MONITOR_R")
public class BzServiceResourceMonitorR { public class BzServiceResourceMonitorR {
@Schema(description = "id") @Schema(description = "id")

3
src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
View File

@ -3,7 +3,6 @@ package com.gunshi.project.xyt.so;
import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.db.dto.DateTimeRangeSo;
import com.gunshi.db.dto.PageSo; import com.gunshi.db.dto.PageSo;
import com.gunshi.project.xyt.validate.markers.QueryPage; import com.gunshi.project.xyt.validate.markers.QueryPage;
import com.gunshi.project.xyt.validate.markers.QueryTimeRange;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
@ -22,7 +21,7 @@ public class BzServiceResourceSo {
@NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) @NotNull(message = "分页参数不能为空", groups = {QueryPage.class})
private PageSo pageSo; private PageSo pageSo;
@NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) // @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class})
private DateTimeRangeSo dateTimeRangeSo; private DateTimeRangeSo dateTimeRangeSo;
@Schema(description = "服务名称") @Schema(description = "服务名称")