From fc501b83c5e95bc0ec3cb861c53c9cdcfd8ee34a Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Fri, 26 Jan 2024 15:14:22 +0800
Subject: [PATCH] =?UTF-8?q?BzServiceResourceSo.dateTimeRangeSo=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BF=85=E5=A1=AB=E7=BA=A6=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/BzServiceResourceController.java | 6 ++++--
 .../gunshi/project/xyt/model/BzServiceResourceMonitorR.java | 2 +-
 .../java/com/gunshi/project/xyt/so/BzServiceResourceSo.java | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
index 131551b..75d77e0 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
@@ -83,8 +83,10 @@ public class BzServiceResourceController {
             query.like(BzServiceResource::getName, so.getName());
         }
 
-        query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd());
-        query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart());
+        if (so.getDateTimeRangeSo() != null) {
+            query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd());
+            query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart());
+        }
         query.orderByDesc(BzServiceResource::getRegisterDate);
 
         Page<BzServiceResource> page = serviceResourceDao.page(so.getPageSo().toPage(), query);
diff --git a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java
index eb8251c..3b62076 100644
--- a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java
+++ b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java
@@ -21,7 +21,7 @@ import java.util.Date;
 @Data
 @ToString
 @Schema(description = "服务资源监控记录")
-@TableName("BZ_SERVICE_RESOURCE_R")
+@TableName("BZ_SERVICE_RESOURCE_MONITOR_R")
 public class BzServiceResourceMonitorR {
 
     @Schema(description = "id")
diff --git a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
index 410f9a9..cd1b296 100644
--- a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
+++ b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
@@ -3,7 +3,6 @@ package com.gunshi.project.xyt.so;
 import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.db.dto.PageSo;
 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 jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -22,7 +21,7 @@ public class BzServiceResourceSo {
     @NotNull(message = "分页参数不能为空", groups = {QueryPage.class})
     private PageSo pageSo;
 
-    @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class})
+    //    @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class})
     private DateTimeRangeSo dateTimeRangeSo;
 
     @Schema(description = "服务名称")