From 5dec8dcc45b40a1d7acdf05be2f2ffd00759535e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 07 六月 2025 16:11:30 +0800
Subject: [PATCH] 1、*-global.yml配置文件中增加有关萤石云应用的配置; 2、萤石云视频监控相关数据库设计(萤石应用+视频监控站); 3、remote模块增加定时下载萤石应用AccessToken的监听器,及网络下载逻辑,数据库存储等功能实现;

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
index ffd3300..bfe0ad6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
@@ -1,7 +1,7 @@
 package com.dy.common.webUtil;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
 @Data
@@ -14,14 +14,33 @@
      * 褰撳墠鏌ヨ椤�
      */
     @Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageCurr ;
+    public Integer pageCurr;
 
     /**
      * 姣忛〉鏁版嵁鏉℃暟
      */
     @Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageSize ;
+    public Integer pageSize;
 
+    /**
+     * 璁剧疆褰撳墠榛樿绗竴椤�
+     * @return
+     */
+    public Integer getPageCurr() {
+        if (pageCurr == null){
+            return 1;
+        }
+        return pageCurr;
+    }
+
+    /**
+     * 璁剧疆褰撳墠榛樿涓�椤靛崄鏉�
+     * @return
+     */
+    public Integer getPageSize() {
+        if (pageSize == null){
+            return 10;
+        }
+        return pageSize;
+    }
 }

--
Gitblit v1.8.0