From ec6193939600ca7930193b1d5942b1700baf9e06 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 21 二月 2025 09:20:15 +0800
Subject: [PATCH] 1.巡检记录列表页的实现 2.巡检记录地图展示路径的详情页。 3.处理巡检记录详情页因打开同一个网址导致的webView不显示问题。 4.实现地图页搜索后的地图跳转功能。 5.巡检记录详情页数据加载的优化，默认加载本地数据，当本地没有数据时从服务端获取数据。
---
app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java b/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
index aa9295a..464f24b 100644
--- a/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
+++ b/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
@@ -9,6 +9,7 @@
import com.dayu.pipirrapp.bean.db.DivideBean;
import com.dayu.pipirrapp.bean.db.MarkerBean;
+import com.dayu.pipirrapp.bean.db.SearchResultBean;
import java.util.List;
@@ -17,7 +18,7 @@
import io.reactivex.rxjava3.core.Maybe;
/**
- * DivideDao -
+ * DivideDao -鍒嗘按鎴�
*
* @author zuoxiao
* @version 1.0
@@ -52,6 +53,16 @@
@Query("select * from DivideBean")
Single<List<DivideBean>> findAllToSingle();
- @Query("SELECT * FROM divide")
+ @Query("SELECT * FROM DivideBean")
Maybe<List<DivideBean>> getAll(); // 鏀逛负杩斿洖Maybe<List<DivideBean>>
+
+ @Query("SELECT * FROM DivideBean WHERE divideName LIKE '%' || :name || '%'")
+ Single<List<DivideBean>> findByDivideNameLike(String name);
+
+ @Query("SELECT divideName as name, 'divide' as type, lat, lng, address, divideId as id FROM DivideBean " +
+ "WHERE divideName LIKE '%' || :keyword || '%' " +
+ "UNION " +
+ "SELECT name, 'marker' as type, lat, lng, address, id FROM MarkerBean " +
+ "WHERE name LIKE '%' || :keyword || '%'")
+ Single<List<SearchResultBean>> searchAllByKeyword(String keyword);
}
--
Gitblit v1.8.0