From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/service/business/SitesService.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/SitesService.java b/server/services/src/main/java/com/doumee/service/business/SitesService.java
index 52c1306..cb77062 100644
--- a/server/services/src/main/java/com/doumee/service/business/SitesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/SitesService.java
@@ -1,8 +1,14 @@
 package com.doumee.service.business;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
+import com.doumee.dao.business.web.request.SitesMonitorDTO;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -14,7 +20,7 @@
 
     /**
      * 鍒涘缓
-     * 
+     *
      * @param sites 瀹炰綋瀵硅薄
      * @return String
      */
@@ -78,7 +84,7 @@
      * @return List<Sites>
      */
     List<Sites> findList(Sites sites);
-  
+
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -97,8 +103,18 @@
 
     /**
      * 绔欑偣棰勮
-     * @param siteId
-     * @throws Exception
      */
-    void siteReservesNotice(String siteId) throws Exception;
+    void siteReservesNotice()  throws Exception;
+
+
+    /**
+     * 鍒嗛〉鏌ヨ绔欑偣鍌ㄨ溅鐩戞帶
+     *
+     * @param pageWrap 鍒嗛〉瀵硅薄
+     * @return PageData<Sites>
+     */
+    PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);
+
+
+
 }

--
Gitblit v1.9.3